From 14aadbc0dc150f11865b5ee5333e15650815365e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Sep 2025 16:36:09 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=85=B1=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/market/vo/UserCouponVO.java | 4 ++++ .../src/main/resources/mapper/MkShopCouponRecordMapper.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java index bebba0fc..1e19d0e2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java @@ -150,6 +150,10 @@ public class UserCouponVO implements Serializable { * 与会员价同享：0-否，1-是 */ private Integer vipPriceShare; + /** + * 与其它优惠共享：0-否，1-是 + */ + private Integer otherCouponShare; /** * 附加规则说明 diff --git a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml index 69c8cb82..75bb0aab 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml @@ -64,6 +64,7 @@ coupon.vip_price_share as vipPriceShare, coupon.rule_details as ruleDetails, coupon.discount_num as discountNum, + coupon.other_coupon_share as otherCouponShare, coupon.use_rule as useRule from mk_shop_coupon_record left join mk_shop_coupon coupon on mk_shop_coupon_record.coupon_id = coupon.id From d3b4eaa4b942d3714f22141caabd385c7a0889cb Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Sep 2025 16:49:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9B=9E=E5=A1=ABID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/service/order/service/impl/PayServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index f310f3f4..d5e89373 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -43,6 +43,7 @@ import com.czg.service.RedisService; import com.czg.service.market.service.impl.MemberOrderServiceImpl; import com.czg.service.order.dto.*; import com.czg.service.order.enums.OrderStatusEnums; +import com.czg.service.order.mapper.OrderPaymentMapper; import com.czg.service.order.service.PayService; import com.czg.system.enums.SysParamCodeEnum; import com.czg.system.service.SysParamsService; @@ -99,6 +100,8 @@ public class PayServiceImpl implements PayService { @Resource private OrderPaymentService paymentService; @Resource + private OrderPaymentMapper paymentMapper; + @Resource private CreditBuyerOrderService buyerOrderService; @Resource private RedisService redisService; @@ -829,7 +832,7 @@ public class PayServiceImpl implements PayService { private Long initOrderPayment(OrderPayment payment) { - paymentService.save(payment); + paymentMapper.insert(payment); return payment.getId(); } From 96796fd3810e8e0e3ba90ea17710e0c0d41ead41 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Sep 2025 17:00:52 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=BB=B6=E5=8D=8A?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index b0dab059..fd5ca491 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -682,7 +682,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) { detail.setHalfPriceCouponNum(BigDecimal.ONE); - BigDecimal halfPrice = detail.getUnitPrice().divide(new BigDecimal("2").setScale(2, RoundingMode.FLOOR)); + BigDecimal halfPrice = detail.getUnitPrice().divide(new BigDecimal("2")).setScale(2, RoundingMode.FLOOR); detail.setDiscountAmount(detail.getDiscountAmount().add(halfPrice)); detail.setPayAmount(detail.getPayAmount().subtract(halfPrice)); oneGiftAmount.setPrice(halfPrice); From 47b9bee58ad876646b1644e386927830fa3a1085 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Sep 2025 17:12:52 +0800 Subject: [PATCH 4/8] mapper --- .../src/main/java/com/czg/order/service/OrderInfoService.java | 2 +- .../java/com/czg/service/order/mapper/OrderInfoMapper.java | 2 +- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- .../src/main/resources/mapper/OrderInfoMapper.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 1777761c..def903e4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -61,5 +61,5 @@ public interface OrderInfoService extends IService { Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum); - Boolean updatePayOrderId(Long shopId, Long orderId, String payType); + Boolean updatePayOrderId(Long orderId, Long paymentId, String payType); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java index 6676d80a..94f68378 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java @@ -140,5 +140,5 @@ public interface OrderInfoMapper extends BaseMapper { int decrMoney(@Param("id") Long id, @Param("amount") BigDecimal amount); - int updatePayOrderId(@Param("shopId") Long shopId, @Param("orderId") Long orderId, @Param("payType") String payType); + int updatePayOrderId(@Param("orderId") Long orderId, @Param("paymentId") Long paymentId, @Param("payType") String payType); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index fd5ca491..74cb76ec 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -1390,8 +1390,8 @@ public class OrderInfoServiceImpl extends ServiceImpl update tb_order_info - set pay_order_id = #{payOrderId}, + set pay_order_id = #{paymentId}, pay_type = #{payType}, update_time=now() where id = #{orderId}; From 8869de273ac8e38441054798c1a86c2915183cec Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Sep 2025 17:22:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=B9=B6=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 74cb76ec..75de9145 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -875,10 +875,10 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Mon, 29 Sep 2025 17:31:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=B9=B6=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 75de9145..0611891c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -876,7 +876,7 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Mon, 29 Sep 2025 17:35:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/service/impl/OrderInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 0611891c..a0c0cf68 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -660,7 +660,7 @@ public class OrderInfoServiceImpl extends ServiceImpl orderDetails, boolean isAllFoods, List couponFoodIds, boolean isAsc, BigDecimalDTO oneGiftAmount) { orderDetails = getDetailsSort(orderDetails, isAsc); for (OrderDetail detail : orderDetails) { - if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) && couponFoodIds.contains(detail.getProductId()) + if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0 && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) { detail.setCouponNum(detail.getCouponNum().add(BigDecimal.ONE)); @@ -702,7 +702,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.ONE) >= 0) { foodsAmount = foodsAmount.add(detail.getPayAmount()); @@ -1390,7 +1390,7 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Mon, 29 Sep 2025 17:54:15 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=88=B8=E5=85=B1?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/vo/UserCouponVo.java | 4 ++++ .../src/main/resources/mapper/MkShopCouponRecordMapper.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java index 692fa87f..2a86f327 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java @@ -128,4 +128,8 @@ public class UserCouponVo { * 与会员价同享：0-否，1-是 */ private Integer vipPriceShare; + /** + * 与其他优惠券同享：0-否，1-是 + */ + private Integer otherCouponShare; } diff --git a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml index 75bb0aab..25af94be 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml @@ -116,6 +116,7 @@ coupon.get_limit as getLimit, coupon.use_limit as useLimit, coupon.discount_share as discountShare, + coupon.other_coupon_share as otherCouponShare, coupon.vip_price_share as vipPriceShare, coupon.rule_details as ruleDetails FROM