Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/OrderWaterDTO.java

@@ -45,5 +45,9 @@ public class OrderWaterDTO {
     private List<OrderGoodsDTO> goodsDTOList;
 
 
+    @ApiModelProperty(value = "父id")
+    private Integer parentId;
+
+
 
 }
\ No newline at end of file

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

@@ -192,20 +192,18 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         String orderNo = orderWaterDTO.getOrderNo();
         //用户id
         Integer userId = orderWaterDTO.getUserId();
+
+        Integer parentId = orderWaterDTO.getParentId() == null ? 0 : orderWaterDTO.getParentId();
+        log.info("活动计算用户拥金----payOrderWater--------userId===" + userId + "---parentId===" + parentId);
+        if (parentId == 0)
+            return;
+
         List<OrderGoodsDTO> goodsDTOList = orderWaterDTO.getGoodsDTOList();
         log.info("活动计算用户拥金----payOrderWater----userId====" + userId + "---orderId===" + orderId + "---orderNo===" + orderNo);
         if (orderId == null || orderId == 0 || userId == null || userId == 0 | CollectionUtils.isEmpty(goodsDTOList)) {
             log.info("购买计算用户拥金----payOrderWater----参数不能为空----orderId===" + orderId);
             return;
         }
-        AppUserRelation relation = relationBiz.getRelationByIdUserIdAndTime(userId);
-        if (relation == null || relation.getParentId() == null || relation.getParentId() == 0) {
-            log.info("活动计算用户拥金----payOrderWater--------userId===" + userId + "---无有效上线");
-            return;
-        }
-        Integer parentId = relation.getParentId();
-        log.info("活动计算用户拥金----payOrderWater--------userId===" + userId + "---parentId===" + parentId);
-
         BigDecimal amount = new BigDecimal("0.00");
         for (OrderGoodsDTO goodsDto : goodsDTOList) {
             //商品id

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

@@ -125,6 +125,7 @@ public class WaterMQHandler {
                             );
                             break;
                         case ACTIVITY:
+                            orderWaterDTO.setParentId(orderMQDTO.getOrderActivityDetail().getParentUserId());
                             orderWaterDTO.setGoodsDTOList(
                                     new ArrayList<OrderGoodsDTO>() {{
                                         add(new OrderGoodsDTO() {{

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/AppActivityInfoController.java

@@ -38,7 +38,8 @@ public class AppActivityInfoController extends BaseController<ActivityInfoUserBi
     @RequestMapping(value = "/app/unauth/H5", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse H5(ActivityInfoUser activityInfoUser){
-        activityInfoUser.setUserId(getCurrentUserIdInt());
+        Integer userId = getCurrentUserIdInt() == null ? 0 :getCurrentUserIdInt();
+        activityInfoUser.setUserId(userId);
         return ObjectRestResponse.succ(baseBiz.getInfo(activityInfoUser));
     }
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderActivityDetail.java

@@ -52,6 +52,11 @@ public class OrderActivityDetail implements Serializable {
 	private Integer rentFreeNum;
 
 
+	@Column(name = "parent_user_id")
+	@ApiModelProperty(value = "父用户id")
+	private Integer parentUserId;
+
+
 	@Column(name = "parent_comisson")
 	@ApiModelProperty(value = "上级拥金")
 	private BigDecimal parentComisson;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderActivityInfoService.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.xxfc.platform.activity.entity.ActivityInfo;
@@ -108,8 +109,9 @@ public class OrderActivityInfoService extends AbstractOrderHandle<OrderActivityI
                 bo.setParentComisson(activityInfoRuleVo.getParentComisson());
             }
         }
-
-
+        AppUserDTO appUserDTO = bo.getAppUserDTO();
+        if (appUserDTO != null && appUserDTO.getParentId() != null)
+            bo.setParentUserId(appUserDTO.getParentId());
         super.handleDetail(bo);
 
         //发送定时取消订单(30分钟)