123

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

@@ -63,6 +63,13 @@ public class AppUserSellingWater implements Serializable {
 	@ApiModelProperty(value = "订单号")
 	private String orderNo;
 
+	/**
+	 *  订单号
+	 */
+	@Column(name = "order_type")
+	@ApiModelProperty(value = "1-租车；2-旅游；3-会员；4-营地")
+	private Integer orderType;
+	
 	    /**
      *  商品id
      */

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

@@ -103,15 +103,16 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
 
         Integer parentId = relation.getParentId();
         log.info("购买计算用户拥金----payOrderWater--------userId===" + userId + "---parentId===" + parentId);
+        BigDecimal amount = new BigDecimal("0.00");
         for (OrderGoodsDTO goodsDto : goodsDTOList) {
             //商品id
             Integer goodId = goodsDto.getGoodId();
             //商品价格
             BigDecimal price = goodsDto.getPrice();
             //商品类型
-            Integer type = goodsDto.getType();
+            Integer orderType = goodsDto.getType();
             //商品比例
-            Integer extract = commissionBiz.getExtract(type, goodId);
+            Integer extract = commissionBiz.getExtract(orderType, goodId);
             AppUserVo userVo = detailBiz.getUserInfoById(parentId);
             Integer positionId = 6;
             if (userVo != null) {
@@ -137,6 +138,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 sellingWater.setPositionId(positionId);
                 sellingWater.setOrderId(orderId);
                 sellingWater.setOrderNo(orderNo);
+                sellingWater.setOrderType(orderType);
                 sellingWater.setGoodId(goodId);
                 sellingWater.setTitle(goodsDto.getTitle());
                 sellingWater.setImg(goodsDto.getImg());
@@ -145,16 +147,15 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 sellingWater.setGoodNumber(goodsDto.getGoodNumber());
                 sellingWater.setCommission(commission);
                 insertSelective(sellingWater);
-                log.info("购买计算用户拥成功----payOrderWater--------userId===" + userId+"----type===="+type);
-                if(type==null){
-                    continue;
+                log.info("购买计算用户拥成功----payOrderWater--------userId===" + userId);
+                amount = amount.add(commission);
+
             }
-                if(type==3){
+            log.info("购买计算用户未入账----payOrderWater--------userId===" + userId+"----amount===="+amount+"--orderType==="+orderType);
+            if(orderType==3){
                 finishOrderWater(orderWaterDTO);
-                }else if(type==2){
-                    myWaterBiz.updMyWalletUnbooked(userId,commission);
-                }
-
+            }else  if(orderType==1||orderType==2){
+                myWaterBiz.updMyWalletUnbooked(userId,amount,1);
             }
         }
     }
@@ -170,14 +171,16 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         List<AppUserSellingWater> list = getWaterList(orderId);
         BigDecimal amount = new BigDecimal("0.00");
         Integer userId = 0;
+        Integer orderType=0;
         if (list.size() > 0) {
             for (AppUserSellingWater sellingWater : list) {
                 Integer id = sellingWater.getId();
+                orderType=sellingWater.getOrderType();
                 userId = sellingWater.getUserId();
                 sellingWater.setWaiting(1);
                 updateById(sellingWater);
                 BigDecimal commission = sellingWater.getCommission();
-                log.info("订单完成计算用户拥金----finishOrderWater----id====" + id + "---commission==" + commission);
+                log.info("订单完成计算用户拥金----finishOrderWater----id====" + id + "---commission==" + commission+"----orderType==="+orderType);
                 amount = amount.add(commission);
             }
         }
@@ -191,6 +194,10 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             detail.setCono(orderId);
             detail.setSource(1);
             myWaterBiz.updMyWater(detail);
+            if(orderType==1||orderType==2){
+                myWaterBiz.updMyWalletUnbooked(userId,amount,2);
+            }
+
         }
 
     }
@@ -205,10 +212,13 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         }
         List<AppUserSellingWater> list = getWaterList(orderId);
         BigDecimal amount = new BigDecimal("0.00");
+        BigDecimal unbooked = new BigDecimal("0.00");
         Integer userId = 0;
+        Integer orderType=0;
         if (list.size() > 0) {
             for (AppUserSellingWater sellingWater : list) {
                 Integer id = sellingWater.getId();
+                orderType=sellingWater.getOrderType();
                 userId = sellingWater.getUserId();
                 sellingWater.setWaiting(1);
                 updateById(sellingWater);
@@ -216,10 +226,11 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 sellingWater.setStatus(1);
                 insertSelective(sellingWater);
                 BigDecimal commission = sellingWater.getCommission();
-                log.info("订单完成计算用户拥金----refundOrderWater----id====" + id + "---commission==" + commission);
+                log.info("订单完成计算用户拥金----refundOrderWater----id====" + id + "---commission==" + commission+"---orderType===="+orderType);
+                unbooked=unbooked.add(commission);
             }
         }
-        log.info("订单完成计算用户拥金----refundOrderWater----orderId====" + orderId + "---amount==" + amount);
+        log.info("订单完成计算用户拥金----refundOrderWater----orderId====" + orderId + "---amount==" + amount+"---unbooked==="+unbooked);
         int r = amount.compareTo(BigDecimal.ZERO);
         //更新钱包
         if (r == 1 && userId > 0) {
@@ -230,6 +241,9 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             detail.setSource(1);
             myWaterBiz.updMyWater(detail);
         }
+        if(orderType==1||orderType==2){
+            myWaterBiz.updMyWalletUnbooked(userId,unbooked,2);
+        }
 
     }
 

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

@@ -72,13 +72,8 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             if (lastTime!=null&&(lastTime==0||isToday(lastTime))){
                 todayAmount=wallet.getTodayAmount().add(amount);
             }
-            //只有拥金才会未入账
-            if (wallet.getUnbooked().compareTo(amount)>0&&walletDetail.getSource()!=null&&walletDetail.getSource()==1){
-                unbooked=wallet.getUnbooked().subtract(amount);
-            }
-
-
         }
+        unbooked=wallet.getUnbooked().subtract(unbooked);
         log.info("---我的钱包入账----userId==="+userId+"----balance===="+balance+"----totalAmount===="+totalAmount+"---todayAmount==="+todayAmount+"---unbooked=="+unbooked);
         walletDetail.setItype(0);
         walletDetail.setBalance(oldBalance);
@@ -116,18 +111,28 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         return isToday;
     }
 
-    //钱包未入账的添加
-    public  void updMyWalletUnbooked(Integer userId,BigDecimal amount){
+    //钱包未入账的处理type1-进;2-出
+    public  void updMyWalletUnbooked(Integer userId,BigDecimal amount,Integer type){
         MyWallet wallet=new MyWallet();
         wallet.setUserId(userId);
         wallet=selectOne(wallet);
+        BigDecimal unbooked=new BigDecimal("0.00");
         if(wallet==null){
             wallet=new MyWallet();
             wallet.setUserId(userId);
-            wallet.setUnbooked(amount);
+            if (type==1){
+                unbooked=amount;
+            }
+            wallet.setUnbooked(unbooked);
             insertSelective(wallet);
         }else {
-            BigDecimal unbooked=wallet.getUnbooked().add(amount);
+            if (type==1){
+                unbooked=wallet.getUnbooked().add(amount);
+            }else {
+                if (wallet.getUnbooked().compareTo(amount)>0){
+                    unbooked=wallet.getUnbooked().subtract(amount);
+                }
+            }
             wallet.setUnbooked(unbooked);
             mapper.updMyWater(wallet);
         }