feat:出生日期

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

@@ -14,6 +14,7 @@ import java.util.Arrays;
 public enum ActCouponValidTypeEnum {
     FIXED_DATE("1", "固定日期"),
     AFTER_RECEIVE("2", "领取后生效"),
+    AFTER_RECEIVE_CURRENT_MONTH("3", "领取后当月"),
     ;
     private final String code;
     private final String desc;

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

@@ -24,7 +24,7 @@ public class ActComCancelDto {
     private Long orderId;
 
     /**
-     * 活动提现金额
+     * 活动抵扣金额
      */
     private Integer useAmountPrice;
 

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

@@ -4,7 +4,6 @@ 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.ActComCancelDto;
-import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity;
 import com.bsd.pjcloud.wallet.api.vo.act.ActComItemVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

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

@@ -7,6 +7,11 @@ import lombok.Data;
 @Data
 public class WalletCodeUseVo extends WalletCodeUseEntity implements BaseUserInterface {
 
+    /**
+     * 活动相关
+     */
+    private String actUniquecode;
+
     /**
      * 用户相关
      */

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

@@ -7,6 +7,9 @@ import lombok.Data;
 @Data
 public class ActCouponRecordVo extends ActCouponRecordEntity implements BaseUserDeptInterface {
 
+    /**
+     * 用户相关
+     */
     private Long userId;
 
     private String username;
@@ -19,4 +22,9 @@ public class ActCouponRecordVo extends ActCouponRecordEntity implements BaseUser
 
     private String userDeptName;
 
+    /**
+     * 活动相关
+     */
+    private String actUniquecode;
+
 }

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

@@ -8,4 +8,5 @@ com.bsd.pjcloud.wallet.api.feign.RemoteWalletRuleTransactionService
 com.bsd.pjcloud.wallet.api.feign.RemoteMchService
 com.bsd.pjcloud.wallet.api.feign.RemoteWalletSettingService
 com.bsd.pjcloud.wallet.api.feign.RemoteWalletThirdZyService
-com.bsd.pjcloud.wallet.api.feign.RemoteWalletTransactionService
+com.bsd.pjcloud.wallet.api.feign.RemoteWalletTransactionService
+com.bsd.pjcloud.wallet.api.feign.RemoteComActService