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

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

@@ -17,6 +17,7 @@ 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;
@@ -33,9 +34,9 @@ import java.util.List;
  */
 @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;
 
@@ -189,7 +190,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         if (list.size()>0){
             for (MyWallet myWallet:list){
                 log.info("---钱包定时处理今日收益updTodayAmount----userId==="+myWallet.getUserId());
-                myWallet.setTodayAmount(BigDecimal.ZERO);
+                myWallet.setTodayAmount(new BigDecimal("0.00"));
                 mapper.updMyWater(myWallet);
             }
         }

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);