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/dto/OrderGoodsDTO.java

@@ -11,8 +11,10 @@ import java.math.BigDecimal;
 @Data
 public class OrderGoodsDTO {
 
-
-
+    public static final Integer TYPE_RENT = 1;
+    public static final Integer TYPE_TOUR = 2;
+    public static final Integer TYPE_MEMBER = 3;
+    public static final Integer TYPE_CAMPSITE = 4;
 
     /**
      *  商品id

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

 package com.github.wxiaoqi.security.admin.handler;
 
 
+import cn.hutool.db.sql.Order;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
 import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
@@ -43,7 +45,7 @@ public class WaterMQHandler {
                 try {
                     String messageId = message.getMessageProperties().getMessageId();
                     String msg = new String(message.getBody(), "UTF-8");
-                    OrderMQDTO orderMQDTO = JSONObject.parseObject(msg, OrderMQDTO.class);
+                    OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
                     OrderWaterDTO orderWaterDTO = new OrderWaterDTO(){{
                         setUserId(orderMQDTO.getUserId());
                         setOrderNo(orderMQDTO.getNo());
@@ -57,13 +59,45 @@ public class WaterMQHandler {
                                             setGoodId(orderMQDTO.getOrderRentVehicleDetail().getModelId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
+                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setTitle(orderMQDTO.getName());
+                                            setType(OrderGoodsDTO.TYPE_RENT);
                                         }});
                                     }}
                             );
+                            break;
+                        case TOUR:
+                            orderWaterDTO.setGoodsDTOList(
+                                    new ArrayList<OrderGoodsDTO>(){{
+                                        add(new OrderGoodsDTO(){{
+                                            setGoodId(orderMQDTO.getOrderTourDetail().getGoodId());
+                                            setGoodNumber(1);
+                                            setImg(orderMQDTO.getPicture());
+                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setTitle(orderMQDTO.getName());
+                                            setType(OrderGoodsDTO.TYPE_RENT);
+                                        }});
+                                    }}
+                            );
+                            break;
+                        case MEMBER:
+                            orderWaterDTO.setGoodsDTOList(
+                                    new ArrayList<OrderGoodsDTO>(){{
+                                        add(new OrderGoodsDTO(){{
+                                            setGoodId(orderMQDTO.getOrderMemberDetail().getMemberLevelId());
+                                            setGoodNumber(1);
+                                            setImg(orderMQDTO.getPicture());
+                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setTitle(orderMQDTO.getName());
+                                            setType(OrderGoodsDTO.TYPE_MEMBER);
+                                        }});
+                                    }}
+                            );
+                            break;
+                        default:
+                            break;
                     }
 
-
-                    orderWaterDTO = JSONObject.parseObject(msg, OrderWaterDTO.class);
                     waterBiz.orderWater(orderWaterDTO);
 
                     executorService.shutdown();

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -50,7 +50,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
         String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "");
         AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
 
-        //获取活动code,并且注册来源是app 并且 是邀请注册
+        //获取活动code,并且注册来源是app 并且 非普通登录
         if(POPULARIZE_0101.equals(registerQueueDTO.getInParamDTO().getActivityCode())
                 && !RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign())) {