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

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.mapper.MyWalletMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -186,11 +187,13 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         example.createCriteria().andGreaterThan("todayAmount",0).andEqualTo("isFrozen",0);
         List<MyWallet> list=selectByExample(example);
         log.info("---钱包定时处理今日收益updTodayAmount----size==="+list.size());
+        XxlJobLogger.log("---钱包定时处理今日收益updTodayAmount----size==="+list.size());
         if (list.size()>0){
             for (MyWallet myWallet:list){
                 log.info("---钱包定时处理今日收益updTodayAmount----userId==="+myWallet.getUserId());
+                XxlJobLogger.log("---钱包定时处理今日收益updTodayAmount----userId==="+myWallet.getUserId());
                 MyWallet myWallet1=new MyWallet();
-                myWallet1.setId(myWallet.getId());
+                myWallet1.setUserId(myWallet.getUserId());
                 myWallet1.setTodayAmount(new BigDecimal("0.00"));
                 updateSelectiveById(myWallet1);
             }

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

@@ -19,22 +19,21 @@ import java.io.Serializable;
  */
 @JobHandler(value = "walletHandler")
 @Component
-//@Slf4j
+@Slf4j
 public class RentDepositJobHandler extends IJobHandler {
 
-//    @Autowired
-//    MyWaterBiz myWaterBiz;
+    @Autowired
+    MyWaterBiz myWaterBiz;
 
     @Override
-    public ReturnT<String> execute(String var1) throws Exception {
+    public ReturnT<String> execute(String var1) {
         try {
-            XxlJobLogger.log("-----定时器进入---walletHandler---");
-//            log.info("-----定时器进入---walletHandler---");
-//            myWaterBiz.updTodayAmount();
-            ReturnT returnT = new ReturnT(){{
-                setCode(100);
-                setMsg("成功");
-            }};
+             XxlJobLogger.log("-----定时器进入---walletHandler---");
+            log.info("-----定时器进入---walletHandler---");
+            myWaterBiz.updTodayAmount();
+            ReturnT returnT = new ReturnT();
+            returnT.setCode(100);
+            returnT.setMsg("成功");
             return returnT;
         } catch (Exception e) {
             XxlJobLogger.log(e);

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

@@ -20,7 +20,7 @@
     </update>
 
     <select id="findExportDataPage" resultType="com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO">
-        select `id`,`member_level` as `memberLevel`,`rent_free_days` as `rentFreeDays`,`total_number` as `totalNumber`,`username`,`status`,`crt_name` as `crtName`,`crt_time`as `crtTime` from `base_user_member_export` where `is_del`=0
+        select `id`,`member_level` as `memberLevel`,`member_name` as `memberName`,`rent_free_days` as `rentFreeDays`,`total_number` as `totalNumber`,`username`,`status`,`crt_name` as `crtName`,`crt_time`as `crtTime` from `base_user_member_export` where `is_del`=0
             <if test="username != null and username != ''">
                and  `username`=#{username}
             </if>