Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

wisenergy-common/pom.xml

@@ -158,11 +158,13 @@
             <artifactId>hutool-all</artifactId>
             <version>4.6.17</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
         </dependency>
         <!--阿里短信依赖-->
         <dependency>
@@ -170,6 +172,35 @@
             <artifactId>aliyun-java-sdk-core</artifactId>
             <version>4.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>4.6.17</version>
+        </dependency>
+        <!-- 视频获取第一帧 -->
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv</artifactId>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->

wisenergy-common/src/main/java/cn/wisenergy/common/utils/DateUtil.java

 package cn.wisenergy.common.utils;
 
+import com.alibaba.druid.util.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
 import java.text.ParseException;

wisenergy-common/src/main/java/cn/wisenergy/common/utils/FileUtil.java

 package cn.wisenergy.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;

wisenergy-common/src/main/java/cn/wisenergy/common/utils/ShareCodeUtil.java

 package cn.wisenergy.common.utils;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 
 /**
  * 
  * @author zen.wang zenyes@gmail.com
  */
+@Slf4j
 public class ShareCodeUtil {
 
     /** 自定义进制(0,1没有加入,容易与o,l混淆) */
@@ -15,8 +16,6 @@ public class ShareCodeUtil {
     /** 进制长度 */
     private static final int binLen=r.length;
     
-    private static Logger logger = Logger.getLogger(ShareCodeUtil.class);
-    
     private static final long startNumber = 100048576L;
 //    private static final long startNumber = 0L;
 

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

@@ -53,7 +53,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userId 用户id
      * @return 用户信息
      */
-    Integer getByUserId(@Param("userId") String userId);
+    User getByUserId(@Param("userId") String userId);
 
     /**
      *  获取用户信息

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -162,7 +162,7 @@
             user_id=#{userId}
         </where>
     </select>
-    <select id="getuserIdById" resultType="cn.wisenergy.model.app.User">
+    <select id="getuserIdById" resultType="java.lang.Integer">
         select
         id
         from

wisenergy-model/pom.xml

@@ -21,6 +21,12 @@
             <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->

wisenergy-model/src/main/java/cn/wisenergy/model/dto/WithdrawBankDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+*@ Description: 钱包余额提现银行卡Dto
+*@ Author     : 86187
+*@ Date       : 2021/3/4 9:51
+ * @author 86187
+ */
+@Data
+@ApiModel("WithdrawBankDto")
+public class WithdrawBankDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id",name = "userId")
+    private String userId;
+
+    /**
+     * 短信验证码
+     */
+    @ApiModelProperty(value = "短信验证码",name = "code")
+    private String code;
+
+    /**
+     * 提现金额
+     */
+    @ApiModelProperty(value = "提现金额",name = "money")
+    private Double money;
+}

wisenergy-service/pom.xml

@@ -69,6 +69,12 @@
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java

@@ -69,12 +69,13 @@ public class AccountManager {
 
         BigDecimal performanceTotal = accountInfo.getEarningsMonth().add(bigDecimal);
         accountInfo.setEarningsMonth(performanceTotal);
+
         //2、修改订单返佣状态：已返佣 1
         orderInfo.setRebateStatus(RebateStatusEnum.ALREADY_REBATE.getCode());
 
         orderMapper.updateById(orderInfo);
 
-        //3、增加账户可用金额
+        //3、更新账户可用金额
         accountMapper.updateById(accountInfo);
 
         //4、添加交易流水记录

wisenergy-service/src/main/java/cn/wisenergy/service/app/BankService.java

@@ -2,6 +2,7 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.BankInfo;
+import cn.wisenergy.model.dto.WithdrawBankDto;
 
 /**
  * @author 86187
@@ -42,9 +43,9 @@ public interface BankService {
     /**
      * 用户提现到银行卡
      *
-     * @param userId 用户标识
+     * @param dto 用户标识
      * @return true 成功 false 失败
      */
-    R<Boolean> userWithdrawBank(String userId);
+    R<Boolean> userWithdrawBank(WithdrawBankDto dto);
 
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/WalletService.java

@@ -29,7 +29,7 @@ public interface WalletService {
     R<WithdrawalAmountVo> getWithdrawalAmount(String userId);
 
     /**
-     * 展示用户累计收益记录
+     * 展示用户累计收益记录 -最近六月 不包括本月
      *
      * @param userId 用户id
      * @return 用户累计收益

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountServiceImpl.java

@@ -120,11 +120,11 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
             }
         }
 
-        //遍历订单  订单状态创建时间，小于当前时间  订单当月任务处理状态 ：未处理
+        //遍历订单  订单状态创建时间，当月时间小于当前时间
         for (OrderInfo orderInfo : list) {
             long createTime = orderInfo.getCreated().getTime();
             long time = System.currentTimeMillis();
-            if (MonthlyTaskStatus.NO_DEAL_WITH.getCode().equals(orderInfo.getMonthlyTaskStatus()) && createTime <= time) {
+            if (createTime <= time) {
                 //获取用户信息
                 User user = usersMapper.selectById(orderInfo.getBuyerId());
                 if (null == user) {
@@ -144,7 +144,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                 teamPerformance.setMonthTeamPerformance(userCount);
                 teamPerformances.add(teamPerformance);
 
-                //2、获取当前用户的上级用户列表
+                //2、获取当前用户的上级用户列表 todo 邀请码等于一个固定值，停止 等于两个值  七位XXXXXXX 和 7777777
                 List<User> userList = getByList(user.getUserId());
                 if (CollectionUtils.isEmpty(userList)) {
                     continue;

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
 import cn.wisenergy.common.utils.*;
+import cn.wisenergy.mapper.AccountMapper;
 import cn.wisenergy.mapper.BankInfoMapper;
 import cn.wisenergy.mapper.UsersMapper;
+import cn.wisenergy.model.app.AccountInfo;
 import cn.wisenergy.model.app.BankInfo;
 import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.dto.WithdrawBankDto;
 import cn.wisenergy.service.app.BankService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +37,9 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    private AccountMapper accountMapper;
+
 
     @Override
     public R<BankInfo> add(BankInfo bankInfo) {
@@ -116,7 +122,26 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
     }
 
     @Override
-    public R<Boolean> userWithdrawBank(String userId) {
+    public R<Boolean> userWithdrawBank(WithdrawBankDto dto) {
+        log.info("shop-mall[]BankServiceImpl[]edit[]input.param.dto:" + dto);
+        if (null == dto || StringUtils.isBlank(dto.getUserId()) || StringUtils.isBlank(dto.getCode()) ||
+                null != dto.getMoney()) {
+            return R.error("入参不能为空!");
+        }
+
+        //1、判断提现金额不得超过余额
+        //获取账户信息
+        AccountInfo accountInfo=accountMapper.getByUserId(dto.getUserId());
+        if(null != accountInfo){
+            if(dto.getMoney() > accountInfo.getExtractMoney().doubleValue()){
+                return R.error("提现金额不得超过余额");
+            }
+        }
+        //2、验证短信验证码
+
+        //3、添加提现交易流水记录
+
+
         return null;
     }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WalletServiceImpl.java

@@ -78,6 +78,7 @@ public class WalletServiceImpl implements WalletService {
 
         WithdrawalAmountVo withdrawalAmountVo = new WithdrawalAmountVo();
         withdrawalAmountVo.setUserId(userId);
+        withdrawalAmountVo.setWithdrawRule("这是一条规则!");
 
         //1、获取用户账户信息
         AccountInfo accountInfo = accountMapper.getByUserIdAndTime(userId, yearMonth);

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -62,7 +62,7 @@ uploadFile:
   location: /opt/images/upload_flowChart/ #自定义上传文件服务器硬盘保存路径  ，linux服务器保存路径 /home/changfa/app/wxbjgkpt/upload_flowChart/
 file:
   upload:
-    path: D:/aplus
+    path: C:/aplus
 jwt:
   # 加密秘钥
   secret: f4e2e52034348f86b67cde581c0f9eb5