Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MyWallet.java

@@ -65,10 +65,10 @@ public class MyWallet implements Serializable {
     private BigDecimal totalAmount;
 
 	/**
-	 *  进账总额(分)
+	 *  今日收益
 	 */
 	@Column(name = "today_amount")
-	@ApiModelProperty(value = "进账总额(元)")
+	@ApiModelProperty(value = "今日收益")
 	private BigDecimal todayAmount;
 	
 	    /**

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseUserMemberExportVo.java

@@ -24,6 +24,7 @@ public class BaseUserMemberExportVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
     private String username;
+    private String memberName;
     private Integer memberLevel;
     private Integer totalNumber;
     private Integer rentFreeDays;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWaterBiz.java

@@ -15,12 +15,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 钱包
@@ -31,9 +34,9 @@ import java.util.Date;
  */
 @Service
 @Slf4j
-public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
-
+public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @Autowired
     MyWalletDetailBiz walletDetailBiz;
 
@@ -176,6 +179,21 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             return  ObjectRestResponse.createDefaultFail();
         }
 
+    }
+
+    //定时处理今日收益
+    public  void  updTodayAmount(){
+        Example example=new Example(MyWallet.class);
+        example.createCriteria().andGreaterThan("todayAmount",0).andEqualTo("isFrozen",0);
+        List<MyWallet> list=mapper.selectByExample(example);
+        log.info("---钱包定时处理今日收益updTodayAmount----size==="+list.size());
+        if (list.size()>0){
+            for (MyWallet myWallet:list){
+                log.info("---钱包定时处理今日收益updTodayAmount----userId==="+myWallet.getUserId());
+                myWallet.setTodayAmount(new BigDecimal("0.00"));
+                mapper.updMyWater(myWallet);
+            }
+        }
 
     }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/jobhandler/RentDepositJobHandler.java

 package com.github.wxiaoqi.security.admin.jobhandler;
 
 
+import com.github.wxiaoqi.security.admin.biz.MyWaterBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.Serializable;
+
 /**
  * 跨平台Http任务
  *
@@ -16,13 +20,17 @@ import org.springframework.stereotype.Component;
 @JobHandler(value = "walletHandler")
 @Component
 @Slf4j
-public class RentDepositJobHandler extends IJobHandler {
+public class RentDepositJobHandler extends IJobHandler implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Autowired
+    MyWaterBiz myWaterBiz;
 
     @Override
     public ReturnT<String> execute(String var1) throws Exception {
         try {
-
-
+            log.info("-----定时器进入---walletHandler---");
+            myWaterBiz.updTodayAmount();
             ReturnT returnT = new ReturnT(){{
                 setCode(100);
                 setMsg("成功");

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/MyWalletMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @email 18178966185@163.com
  * @date 2019-07-11 14:14:54
  */
-public interface MyWalletMapper extends Mapper<MyWallet> {
+public interface MyWalletMapper extends Mapper<MyWallet>  {
 
     void  updMyWater(MyWallet myWallet);
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

@@ -57,11 +57,6 @@ public class UserMemberAdminController {
             if (userMemberData.size() < 1) {
                 return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
             }
-            for (String[] userMemberDatum : userMemberData) {
-                if (userMemberDatum.length!=4){
-                    return ObjectRestResponse.createFailedResult(1002, "数据不完整！！！");
-                }
-            }
             userMemberData.remove(0);
             try {
                 int effectSize = baseUserMemberExportBiz.importUserMember(userMemberData,Integer.valueOf(infoFromToken.getId()),infoFromToken.getUniqueName());

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -37,7 +37,7 @@
         m.total_number as totalNumber,
         m.buy_count as buyCount,
         m.valid_time as validTime,
-        m.member_name as `memberName`
+        m.member_name as `memberName`,
         ml.name as name
         from
         base_user_member m