Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -26,14 +26,14 @@ public class MyWalletDetail implements Serializable {
     @Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("主键ID")
-    private Long id;
+    private Integer id;
 	
 	    /**
      *  用户ID
      */
     @Column(name = "user_id")
 	@ApiModelProperty(value = "用户ID")
-    private String userId;
+    private Integer userId;
 	
 	    /**
      *  来源：0-活动，1-佣金，2-会员充值，10-提现，11-转账，12-购买
@@ -75,7 +75,7 @@ public class MyWalletDetail implements Serializable {
      */
     @Column(name = "cono")
 	@ApiModelProperty(value = "单号")
-    private String cono;
+    private Integer cono;
 	
 	    /**
      *  加上当时的收入的余额
@@ -87,9 +87,9 @@ public class MyWalletDetail implements Serializable {
 	    /**
      *  操作者ID(如果系统操作,-1)
      */
-    @Column(name = "oper_user")
+    @Column(name = "crt_user")
 	@ApiModelProperty(value = "操作者ID(如果系统操作,-1)")
-    private Integer operUser;
+    private Integer crtUser;
 	
 	    /**
      *  操作时间

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

@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -129,9 +130,11 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
         }
         List<AppUserSellingWater> list=getWaterList(orderId);
         BigDecimal amount=new BigDecimal("0.00");
+        Integer  userId=0;
         if (list.size()>0){
             for (AppUserSellingWater sellingWater:list){
                 Integer id=sellingWater.getId();
+                userId=sellingWater.getUserId();
                 sellingWater.setWaiting(1);
                 updateById(sellingWater);
                 BigDecimal commission=sellingWater.getCommission();
@@ -139,8 +142,19 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
                 amount.add(commission);
             }
         }
+        log.info("订单完成计算用户拥金----finishOrderWater----orderId===="+orderId+"---amount=="+amount);
+        int r=amount.compareTo(BigDecimal.ZERO);
+        if(r==1&&userId>0){
+            MyWalletDetail walletDetail=new MyWalletDetail();
+            walletDetail.setUserId(userId);
+            walletDetail.setSource(1);
+            walletDetail.setCono(orderId);
+            walletDetail.setItype(1);
+            walletDetail.setAmount(amount);
 
 
+        }
+
 
 
     }