From ed293f8128756bc73d5288a9561ce01a716bfc38 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 13:44:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BE=A4=E8=81=8A=E5=88=B8=20=E7=9A=84=20?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/market/entity/MkShopCouponRecord.java | 3 +++ .../market/service/impl/MkShopCouponRecordServiceImpl.java | 3 +-- .../service/order/service/impl/OrderInfoCustomServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java index e8ad2a711..a23b2783d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java @@ -122,6 +122,9 @@ public class MkShopCouponRecord implements Serializable { private LocalDateTime useEndTime; @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime useStartTime; + + @Column(ignore = true) + private String couponName; /** * 有效期类型：fixed（固定时间），custom（自定义时间） */ diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index e8f2cad37..a7dec33ba 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -519,11 +519,10 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl Date: Wed, 3 Dec 2025 13:51:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=90=91=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoCustomServiceImpl.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/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index cdfa32cb0..22aab993b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -500,9 +500,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { if (param.getVipDiscountAmount().compareTo(BigDecimal.ZERO) <= 0) { param.setVipDiscountAmount(BigDecimal.ZERO); } else { - BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN); BigDecimal discountAmount = newTotalAmount.multiply(discount); - discountAmount = discountAmount.setScale(2, RoundingMode.HALF_UP); + discountAmount = discountAmount.setScale(2, RoundingMode.DOWN); if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) { log.info("会员整单折扣金额不正确：传递为：{}，计算为：{}", param.getVipDiscountAmount(), discountAmount); throw new OrderValidateException("生成支付订单失败，会员整单折扣金额不正确"); From fd8d2cf57c810f3760f2e77dc279638446df84be Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 14:07:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/AChatCouponController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java index 845b6885f..5effa800b 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java @@ -43,11 +43,11 @@ public class AChatCouponController { */ @GetMapping("/page") @SaAdminCheckPermission(value = "chat:coupon:page", name = "群聊优惠券活动-分页查询") - public Page pageChatCoupon(@RequestParam(required = false, defaultValue = "1") Integer page, + public CzgResult> pageChatCoupon(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size, @RequestParam(required = false) Integer status) { Long shopId = StpKit.USER.getShopId(); - return chatCouponService.pageChatCoupon(shopId, page, size, status); + return CzgResult.success(chatCouponService.pageChatCoupon(shopId, page, size, status)); } /** @@ -66,11 +66,11 @@ public class AChatCouponController { */ @GetMapping("/record") @SaAdminCheckPermission(value = "chat:coupon:record", name = "群聊优惠券活动-发放记录") - public Page grantChatCouponRecord(@RequestParam Long id, + public CzgResult> grantChatCouponRecord(@RequestParam Long id, @RequestParam(required = false) Integer status, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size) { - return chatCouponService.grantChatCouponRecord(id, status, page, size); + return CzgResult.success(chatCouponService.grantChatCouponRecord(id, status, page, size)); } From 5aded8c6c1278b054b849d01112fb579e5c11fc9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 14:16:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=B3=A8=E8=A7=A3=20?= =?UTF-8?q?=E6=97=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/market/service/ShopCouponService.java | 2 +- .../service/market/service/impl/ShopCouponServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java index a328857af..19b0d0659 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java @@ -44,7 +44,7 @@ public interface ShopCouponService extends IService { List findCoupon(Long shopId, Long shopUserId, Integer type, Integer isFood); - Boolean use(List ids, Long shopUserId, Long orderId); + void use(List ids, Long shopUserId, Long orderId); Boolean refund(Long orderId, Long shopUserId); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index 11b827a9f..2e1f5540b 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -339,11 +339,10 @@ public class ShopCouponServiceImpl extends ServiceImpl ids, Long shopUserId, Long orderId) { + public void use(List ids, Long shopUserId, Long orderId) { List records = recordService.listByIds(ids); if (records.isEmpty()) { log.error("优惠券使用失败，订单Id:{}", orderId); - return false; } Map chatCouponIdCountMap = records.stream() .filter(record -> "群聊发放".equals(record.getSource())) @@ -389,7 +388,7 @@ public class ShopCouponServiceImpl extends ServiceImpl Date: Wed, 3 Dec 2025 14:50:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=B1=E6=95=88=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/AChatCouponController.java | 5 ++--- .../java/com/czg/controller/user/UChatCouponController.java | 4 ++-- .../main/java/com/czg/market/service/ChatCouponService.java | 2 +- .../service/market/service/impl/ChatCouponServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java index 5effa800b..4c1863a64 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java @@ -55,10 +55,9 @@ public class AChatCouponController { */ @DeleteMapping("/expired/{id}") @SaAdminCheckPermission(value = "chat:coupon:expired", name = "群聊优惠券活动-失效") - public CzgResult expiredChatCoupon(@PathVariable Long id) { + public CzgResult expiredChatCoupon(@PathVariable Long id) { Long shopId = StpKit.USER.getShopId(); - chatCouponService.expiredChatCoupon(shopId, id); - return CzgResult.success(); + return CzgResult.success(chatCouponService.expiredChatCoupon(shopId, id)); } /** diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java index 8556579c1..d6f754e06 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java @@ -23,8 +23,8 @@ public class UChatCouponController { * 群聊优惠券活动-发放优惠券 */ @PostMapping("/grant") - public CzgResult grantChatCoupon(@RequestBody ChatCouponGrantDTO chatCouponGrant) { + public CzgResult grantChatCoupon(@RequestBody ChatCouponGrantDTO chatCouponGrant) { chatCouponService.grantChatCoupon(chatCouponGrant.getId(), chatCouponGrant.getShopUserId(), chatCouponGrant.getUserId()); - return CzgResult.success(); + return CzgResult.success(true); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java index f3b7f3e2d..7cdf960a5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java @@ -28,7 +28,7 @@ public interface ChatCouponService extends IService { /** * 失效 */ - void expiredChatCoupon(Long shopId, Long id); + boolean expiredChatCoupon(Long shopId, Long id); /** * 发放优惠券 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index c255e475e..ab4e98d70 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -82,10 +82,10 @@ public class ChatCouponServiceImpl extends ServiceImpl Date: Wed, 3 Dec 2025 15:29:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=95=86=E5=93=81Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopProdStatisticMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml index 116e7fc5d..96c20f3ac 100644 --- a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml @@ -96,7 +96,7 @@ sum(statistic.refund_amount) AS refundAmount FROM tb_shop_prod_statistic statistic - INNER JOIN tb_product prod ON tb_shop_prod_statistic.prod_id = prod.id + INNER JOIN tb_product prod ON statistic.prod_id = prod.id WHERE statistic.shop_id = #{shopId} AND statistic.create_day = #{day} From 31564b3012c4cc526416cdb2aab0be7979867e77 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 17:12:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=8F=9C=E5=93=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/vo/OrderDetailSmallVO.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java index 964fb0c08..858caeaec 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 订单详情 实体类。 @@ -35,6 +36,11 @@ public class OrderDetailSmallVO implements Serializable { private BigDecimal unitPrice; private BigDecimal payAmount; private String remark; + private String subStatus; + private LocalDateTime orderTime; + private LocalDateTime startOrderTime; + private LocalDateTime dishOutTime; + private LocalDateTime foodServeTime; }