mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-10-02 02:06:38 +08:00
解决未到生效时间优惠券显示的问题
This commit is contained in:
parent
8f5ab606ce
commit
671bb459a3
@ -13,6 +13,7 @@ import net.lab1024.smartadmin.module.system.alipay.AliPayService;
|
|||||||
import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity;
|
import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity;
|
||||||
import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
|
import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
|
||||||
import net.lab1024.smartadmin.module.system.royalcanin.CouponService;
|
import net.lab1024.smartadmin.module.system.royalcanin.CouponService;
|
||||||
|
import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponCosumeEntity;
|
||||||
import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponGetAllEntity;
|
import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponGetAllEntity;
|
||||||
import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
|
||||||
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
|
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
|
||||||
@ -137,6 +138,14 @@ public class OrderController {
|
|||||||
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
||||||
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
||||||
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
||||||
|
//通过传优惠券码锁定优惠券
|
||||||
|
CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
|
||||||
|
couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
|
||||||
|
String result = couponService.couponCosume(couponCosumeEntity);
|
||||||
|
JSONObject couponJsonResult = JSONObject.parseObject(result);
|
||||||
|
if(!"0".equals(couponJsonResult.getString("code"))){
|
||||||
|
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
|
||||||
|
}
|
||||||
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
||||||
}
|
}
|
||||||
ordersEntity.setOrderAddress(orderAddress);
|
ordersEntity.setOrderAddress(orderAddress);
|
||||||
@ -247,6 +256,14 @@ public class OrderController {
|
|||||||
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
||||||
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
||||||
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
||||||
|
//通过传优惠券码锁定优惠券
|
||||||
|
CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
|
||||||
|
couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
|
||||||
|
String result = couponService.couponCosume(couponCosumeEntity);
|
||||||
|
JSONObject couponJsonResult = JSONObject.parseObject(result);
|
||||||
|
if(!"0".equals(couponJsonResult.getString("code"))){
|
||||||
|
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
|
||||||
|
}
|
||||||
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
||||||
}
|
}
|
||||||
ordersEntity.setOrderAddress(orderAddress);
|
ordersEntity.setOrderAddress(orderAddress);
|
||||||
@ -356,6 +373,14 @@ public class OrderController {
|
|||||||
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
|
||||||
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
|
||||||
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
|
||||||
|
//通过传优惠券码锁定优惠券
|
||||||
|
CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
|
||||||
|
couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
|
||||||
|
String result = couponService.couponCosume(couponCosumeEntity);
|
||||||
|
JSONObject couponJsonResult = JSONObject.parseObject(result);
|
||||||
|
if(!"0".equals(couponJsonResult.getString("code"))){
|
||||||
|
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
|
||||||
|
}
|
||||||
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
|
||||||
}
|
}
|
||||||
ordersEntity.setOrderAddress(orderAddress);
|
ordersEntity.setOrderAddress(orderAddress);
|
||||||
|
Loading…
Reference in New Issue
Block a user