Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Comparator;

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;
@@ -34,9 +35,8 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>implements Serializable {
+public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
-    private static final long serialVersionUID = 1L;
     @Autowired
     MyWalletDetailBiz walletDetailBiz;
 
@@ -185,13 +185,17 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>implements Seri
     public  void  updTodayAmount(){
         Example example=new Example(MyWallet.class);
         example.createCriteria().andGreaterThan("todayAmount",0).andEqualTo("isFrozen",0);
-        List<MyWallet> list=mapper.selectByExample(example);
+        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());
-                myWallet.setTodayAmount(new BigDecimal("0.00"));
-                mapper.updMyWater(myWallet);
+                XxlJobLogger.log("---钱包定时处理今日收益updTodayAmount----userId==="+myWallet.getUserId());
+                MyWallet myWallet1=new MyWallet();
+                myWallet.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

@@ -20,21 +20,20 @@ import java.io.Serializable;
 @JobHandler(value = "walletHandler")
 @Component
 @Slf4j
-public class RentDepositJobHandler extends IJobHandler implements Serializable {
+public class RentDepositJobHandler extends IJobHandler {
 
-    private static final long serialVersionUID = 1L;
     @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("成功");
-            }};
+            ReturnT returnT = new ReturnT();
+            returnT.setCode(100);
+            returnT.setMsg("成功");
             return returnT;
         } catch (Exception e) {
             XxlJobLogger.log(e);