feat:支付使用优惠券

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

@@ -18,4 +18,14 @@ public class ActCouponRecordDto extends ActCouponRecordEntity {
 
     private LocalDateTime[] createTimeList;
 
+    /**
+     * 适用范围 (1:全场通用 2:指定商户 3:指定分类 4:指定商品)
+     */
+    private String useScopeType;
+
+    /**
+     * 适用范围ID集合 (商户ID/分类ID/商品ID, 逗号分隔)
+     */
+    private String scopeId;
+
 }

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

@@ -0,0 +1,23 @@
+package com.bsd.pjcloud.wallet.api.dto.act;
+
+import lombok.Data;
+
+@Data
+public class ActCouponRecordRemoteCancelDto {
+
+    /**
+     * 优惠券id
+     */
+    private Long actCouponRecordId;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 优惠券抵消的金额
+     */
+    private Integer useAmountPrice;
+
+}

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

@@ -0,0 +1,27 @@
+package com.bsd.pjcloud.wallet.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+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.dto.act.ActCouponRecordRemoteCancelDto;
+import com.bsd.pjcloud.wallet.api.vo.act.ActCancelItemVo;
+import com.bsd.pjcloud.wallet.api.vo.act.ActCouponRecordVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(contextId = "remoteActCouponCancelService", value = ServiceNameConstants.WALLET_SERVICE)
+public interface RemoteActCouponCancelService {
+
+    @NoToken
+    @GetMapping("/act-coupon-record/remote/get-detail")
+    R<ActCouponRecordVo> remoteGetDetail(@RequestParam Long actCouponRecordId, @RequestParam Integer totalPrice);
+
+    @NoToken
+    @PostMapping("/act-coupon-record/remote/cancel")
+    R<Boolean> remoteCancel(@RequestBody ActCouponRecordRemoteCancelDto dto);
+
+}

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

@@ -27,4 +27,8 @@ public class ActCouponRecordVo extends ActCouponRecordEntity implements BaseUser
      */
     private String actUniquecode;
 
+    /**
+     * 优惠券抵消的金额
+     */
+    private Integer useAmountPrice;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -1,4 +1,5 @@
 com.bsd.pjcloud.wallet.api.feign.RemoteActCancelService
+com.bsd.pjcloud.wallet.api.feign.RemoteActCouponCancelService
 com.bsd.pjcloud.wallet.api.feign.RemoteWalletService
 com.bsd.pjcloud.wallet.api.feign.RemoteMchPickUpService
 com.bsd.pjcloud.wallet.api.feign.RemoteMchRuleJoinService