通用配置

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -273,20 +273,14 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
 
         if (StringUtils.isEmpty(userCouponFindDTO.getPhone())) {
             List<Integer> userIds = data.stream().map(UserCouponDTO::getUserId).distinct().collect(Collectors.toList());
-            if (log.isDebugEnabled()){
-                log.debug("查询的用户ids【{}】",userIds);
-            }
             userIdAndAppuserLoginMap = userFeign.findAppUsersByUserIds(userIds);
-            if (log.isDebugEnabled()){
-                log.debug("查询的用户信息【{}】",userIdAndAppuserLoginMap);
-            }
         }
         List<UserCouponPageVo> userCouponPageVos = new ArrayList<>();
         UserCouponPageVo userCouponPageVo;
         for (UserCouponDTO userCouponDTO : data) {
             userCouponPageVo = new UserCouponPageVo();
             BeanUtils.copyProperties(userCouponDTO, userCouponPageVo);
-            if (Objects.nonNull(userCouponFindDTO.getPhone())) {
+            if (StringUtils.isNotEmpty(userCouponFindDTO.getPhone())) {
                 userCouponPageVo.setPhone(userCouponFindDTO.getPhone());
             } else {
                 userCouponPageVo.setPhone(userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()) == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()).getUsername());

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Cofig.java

@@ -65,5 +65,6 @@ public class Cofig implements Serializable {
 	@ApiModelProperty(value = "标题")
     private String title;
 
+    @Column(name = "params")
     private String params;
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/WithDrawRuleVo.java

 package com.xxfc.platform.app.entity.vo;
 
 import lombok.Data;
-
 import java.math.BigDecimal;
 
 /**
@@ -14,17 +13,38 @@ import java.math.BigDecimal;
 public class WithDrawRuleVo {
 
     /**
-     * 提现金额
+     * 最低提现金额
      */
-    private BigDecimal amount;
+    private BigDecimal minAmount;
 
     /**
-     * 手续费率
+     * 提现手续费率
      */
     private double proceduReates;
 
+    /**
+     * 月额度
+     */
+    private BigDecimal  amountOfMonth;
+
+    /**
+     * 日额度
+     */
+    private BigDecimal  amountOfDay;
+
+    /**
+     * 最多提现次数（月）
+     */
+    private Integer  maxNumberOfWithdraw;
+
+    /**
+     * 1. 线上 2.线下
+     */
+    private Integer  withdrawWay;
+
     /**
      * 规则说明
      */
     private String description;
+
 }