123

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

@@ -171,7 +171,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
                 updateById(sellingWater);
                 BigDecimal commission=sellingWater.getCommission();
                 log.info("订单完成计算用户拥金----finishOrderWater----id===="+id+"---commission=="+commission);
-                amount.add(commission);
+                amount=amount.add(commission);
             }
         }
         log.info("订单完成计算用户拥金----finishOrderWater----orderId===="+orderId+"---amount=="+amount);

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
+import com.github.wxiaoqi.security.admin.mapper.MyWalletDetailMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:18
+ */
+@Transactional
+@Service
+public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDetail> {
+
+
+}

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

@@ -28,7 +28,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
 
     @Autowired
-    MyWalletDetailMapper walletDetailMapper;
+    MyWalletDetailBiz walletDetailBiz;
 
 
     //我的钱包入账
@@ -60,7 +60,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             totalAmount=wallet.getTotalAmount().add(amount);
             Long lastTime=wallet.getLastIntime();
             todayAmount=amount;
-            if (lastTime!=null&&isToday(lastTime)){
+            if (lastTime!=null&&(lastTime==0||isToday(lastTime))){
                 todayAmount=wallet.getTodayAmount().add(amount);
             }
             unbooked=wallet.getUnbooked().subtract(unbooked);
@@ -74,7 +74,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         walletDetail.setItype(1);
         walletDetail.setAmount(amount);
         walletDetail.setBalance(oldBalance);
-        walletDetailMapper.insertSelective(walletDetail);
+        walletDetailBiz.insertSelective(walletDetail);
         Long time=System.currentTimeMillis();
         wallet.setBalance(balance);
         wallet.setTodayAmount(todayAmount);

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

@@ -6,37 +6,37 @@
      <update id="updMyWater" parameterType="com.github.wxiaoqi.security.admin.entity.MyWallet">
         update  my_wallet
         <set>
-        <if test="userId!=null AND userId>0">
+        <if test=" userId!=null and userId!=''">
             user_id=#{userId},
         </if>
-            <if test="balance!=null AND balance>0">
+            <if test="balance!=null and balance!='' ">
              balance=#{balance},
          </if>
-         <if test="balance!=null AND balance>0">
+         <if test="balance!=null and balance!='' ">
              withdrawals=#{withdrawals},
          </if>
-         <if test="totalAmount!=null AND totalAmount>0">
+         <if test="totalAmount!=null and totalAmount!='' ">
              total_amount=#{totalAmount},
          </if>
-         <if test="todayAmount!=null AND todayAmount>0">
+         <if test="todayAmount!=null and todayAmount!='' ">
              today_amount=#{todayAmount},
          </if>
-         <if test="unbooked!=null AND unbooked>0">
+         <if test="unbooked!=null and unbooked!='' ">
              unbooked=#{unbooked},
          </if>
-         <if test="isFrozen!=null">
+         <if test="isFrozen!=null and isFrozen!='' ">
              is_frozen=#{isFrozen},
          </if>
-        <if test="lastIntime!=null AND lastIntime>0">
+        <if test="lastIntime!=null and lastIntime!='' ">
             last_intime=#{lastIntime},
         </if>
-        <if test="crtTime!=null AND crtTime>0">
+        <if test="crtTime!=null and crtTime!='' ">
             crt_time=#{crtTime},
         </if>
-        <if test="updTime!=null AND updTime>0">
+        <if test="updTime!=null and updTime!='' ">
             upd_time=#{updTime},
         </if>
-        <if test="version!=null ">
+        <if test="version!=null and version!='' ">
             version=version+1,
         </if>
         </set>