feat:核销活动

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletCodeBizEnum.java

@@ -14,6 +14,7 @@ public enum WalletCodeBizEnum {
     CANTEEN_RESERVE("3", "食堂线上预订"),
     SUPERMARKET_RESERVE("4", "超市线上预订"),
     USER_WALLET("5", "用户钱包二维码"),
+    FARMER_RESERVE("6", "用户钱包二维码"),
     ;
     private final String code;
 

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCancelDto.java

@@ -3,7 +3,10 @@ package com.bsd.pjcloud.wallet.api.dto.act;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ActCancelDto extends ActCancelEntity {
 
+
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCancelItemDto.java

@@ -4,10 +4,15 @@ import com.bsd.pjcloud.wallet.api.entity.act.ActCancelItemEntity;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class ActCancelItemDto extends ActCancelItemEntity {
 
+    private List<Long> actIdList;
+
+    private List<Long> mchIdList;
+
     private LocalDateTime[] cancelTimeList;
 
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteActCancelService.java

@@ -5,6 +5,7 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.wallet.api.dto.act.ActCancelItemDto;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCancelItemEntity;
+import com.bsd.pjcloud.wallet.api.vo.act.ActCancelItemVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,7 +18,7 @@ public interface RemoteActCancelService {
 
     @NoToken
     @GetMapping("/act/cancel-item/get-detail")
-    R<ActCancelItemEntity> getDetail(@RequestParam Long id);
+    R<ActCancelItemVo> getDetail(@RequestParam Long id);
 
     @NoToken
     @PostMapping("/act/cancel-item/cancel")

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/act/ActCancelItemCountVo.java

@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.wallet.api.vo.act;
+
+import lombok.Data;
+
+@Data
+public class ActCancelItemCountVo {
+
+    private Long actId;
+
+    /**
+     * 预约总数
+     */
+    private Long totalCount;
+
+    /**
+     * 核销总数
+     */
+    private Long cancelCount;
+
+    /**
+     * 未核销总数
+     */
+    private Long cancelAwaitCount;
+
+}

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/act/ActCancelItemVo.java

@@ -21,4 +21,9 @@ public class ActCancelItemVo extends ActCancelItemEntity {
      */
     private String mchName;
 
+    /**
+     * 活动核销价格
+     */
+    private Integer activeCancelPrice;
+
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/act/ActCancelVo.java

@@ -18,4 +18,9 @@ public class ActCancelVo extends ActCancelEntity implements BaseMchInterface {
 
     private String merchantType;
 
+    /**
+     * 统计相关
+     */
+    private ActCancelItemCountVo countVo;
+
 }