123

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

@@ -104,13 +104,15 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         Integer parentId = relation.getParentId();
         log.info("购买计算用户拥金----payOrderWater--------userId===" + userId + "---parentId===" + parentId);
         BigDecimal amount = new BigDecimal("0.00");
+        //商品类型
+        Integer orderType=0;
         for (OrderGoodsDTO goodsDto : goodsDTOList) {
             //商品id
             Integer goodId = goodsDto.getGoodId();
             //商品价格
             BigDecimal price = goodsDto.getPrice();
-            //商品类型
-            Integer orderType = goodsDto.getType();
+
+            orderType = goodsDto.getType();
             //商品比例
             Integer extract = commissionBiz.getExtract(orderType, goodId);
             AppUserVo userVo = detailBiz.getUserInfoById(parentId);
@@ -149,15 +151,14 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 insertSelective(sellingWater);
                 log.info("购买计算用户拥成功----payOrderWater--------userId===" + userId);
                 amount = amount.add(commission);
-
-            }
-            log.info("购买计算用户未入账----payOrderWater--------userId===" + userId+"----amount===="+amount+"--orderType==="+orderType);
-            if(orderType==3){
-                finishOrderWater(orderWaterDTO);
-            }else  if(orderType==1||orderType==2){
-                myWaterBiz.updMyWalletUnbooked(userId,amount,1);
             }
         }
+        log.info("购买计算用户未入账----payOrderWater--------userId===" + parentId+"----amount===="+amount+"--orderType==="+orderType);
+        if(orderType==3){
+            finishOrderWater(orderWaterDTO);
+        }else  if(orderType==1||orderType==2){
+            myWaterBiz.updMyWalletUnbooked(parentId,amount,1);
+        }
     }
 
     //订单完成计算用户拥金

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

@@ -113,6 +113,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
     //钱包未入账的处理type1-进;2-出
     public  void updMyWalletUnbooked(Integer userId,BigDecimal amount,Integer type){
+        log.info("---钱包未入账的处理----userId==="+userId+"----type==="+type);
         MyWallet wallet=new MyWallet();
         wallet.setUserId(userId);
         wallet=selectOne(wallet);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -89,7 +89,7 @@ public class WaterMQHandler {
                                             setImg(orderMQDTO.getPicture());
                                             setPrice(orderMQDTO.getGoodsAmount());
                                             setTitle(orderMQDTO.getName());
-                                            setType(OrderGoodsDTO.TYPE_RENT);
+                                            setType(OrderGoodsDTO.TYPE_TOUR);
                                         }});
                                     }}
                             );