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..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 @@ -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)); } /** @@ -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)); } /** @@ -66,11 +65,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)); } 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/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-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-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-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; } 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 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