diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 444ee293..36da1352 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -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.conf.AlipayConfig; 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.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; @@ -137,6 +138,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); 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); } ordersEntity.setOrderAddress(orderAddress); @@ -247,6 +256,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); 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); } ordersEntity.setOrderAddress(orderAddress); @@ -356,6 +373,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); 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); } ordersEntity.setOrderAddress(orderAddress);