Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java

@@ -19,4 +19,8 @@ public class AdamMemberOrderCodeParam implements Serializable {
     @ApiModelProperty(position = 2, required = true, example = "0")
     private LocalDateTime birthday;
 
+    private String ip;
+    private String source;
+    private String version;
+
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java

@@ -46,5 +46,9 @@ public class AdamMemberOrderParam implements Serializable {
     private String openId;
     @ApiModelProperty(position = 11, required = false, value = "ip地址")
     private String clientIp;
+    @ApiModelProperty(position = 12, required = false, value = "版本")
+    private String version;
+    @ApiModelProperty(position = 13, required = false, value = "来源")
+    private String source;
 
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderVo.java

@@ -6,6 +6,8 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 @ApiModel(value = "AdamMemberOrderVo", description = "订单详情展示")
 @Data
@@ -44,6 +46,12 @@ public class AdamMemberOrderVo implements Serializable {
     private String memberCode;
     @ApiModelProperty(position = 15, value = "价格")
     private BigDecimal price;
+    @ApiModelProperty(position = 16, value = "价格")
+    private String ip;
+    @ApiModelProperty(position = 17, value = "价格")
+    private String source;
+    @ApiModelProperty(position = 18, value = "价格")
+    private String version;
 
     public static final AdamMemberOrderVo obj = new AdamMemberOrderVo();
 
@@ -55,4 +63,29 @@ public class AdamMemberOrderVo implements Serializable {
         }
         return new AdamMemberOrderVo();
     }
+
+    public static List<Object> getMemberOrderMqList (AdamMemberOrderVo orderVo) {
+        List<Object> mqList = new ArrayList<>();
+        mqList.add(orderVo.getOrderNo());
+        mqList.add(orderVo.getUid());
+        mqList.add(orderVo.getMode());
+        mqList.add(orderVo.getPrice());
+        mqList.add(BigDecimal.valueOf(0));
+        mqList.add(orderVo.getMemberName());
+        mqList.add(orderVo.getMemberId());
+        mqList.add(orderVo.getMemberPriceId());
+        mqList.add(orderVo.getDays());
+        mqList.add(orderVo.getState());
+        mqList.add(orderVo.getMemberNo());
+        mqList.add(orderVo.getPayChannel());
+        mqList.add(orderVo.getPayNo());
+        mqList.add(orderVo.getBirthday());
+        mqList.add(orderVo.getPaymentAt());
+        mqList.add(orderVo.getCreatedAt());
+        mqList.add(orderVo.getCreatedAt());
+        mqList.add(orderVo.getIp());
+        mqList.add(orderVo.getSource());
+        mqList.add(orderVo.getVersion());
+        return mqList;
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -49,6 +49,9 @@ public class AdamMemberOrderController {
     @PostMapping("/use/memberCode")
     public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) {
         try {
+            param.setIp("127.0.0.1");
+            param.setSource("Android");
+            param.setVersion("5.5.5");
             boolean result = adamMemberOrderService.useMemberCode(param);
             if (!result) {
                 return ResponseDto.failure("兑换失败");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -146,6 +146,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         orderVo.setState(AdamMemberConst.STATUS_UNPAID);
         orderVo.setUid(param.getUid());
         orderVo.setPrice(param.getPrice());
+        orderVo.setIp(param.getClientIp());
+        orderVo.setVersion(param.getVersion());
+        orderVo.setSource(param.getSource());
 
         mongoTemplate.insert(orderVo, AdamMemberOrderVo.class.getSimpleName());
 
@@ -273,7 +276,10 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName())
                 .updateOne(Query.query(Criteria.where("code").is(memberCodeVo.getCode())).getQueryObject(), object);
         // todo MQ 统一通知队列插入数据库
-        List<Object> mqList = new ArrayList<>();
+        orderVo.setIp(param.getIp());
+        orderVo.setSource(param.getSource());
+        orderVo.setVersion(param.getVersion());
+        List<Object> mqList = AdamMemberOrderVo.getMemberOrderMqList(orderVo);
         /*
         ( `order_no`, `uid`, `mode`, `price`,
          `price_paid`, `member_name`, `member_id`,
@@ -281,24 +287,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
          `pay_channel`, `pay_no`, `birthday`, `payment_at`,
          `created_at`, `updated_at`, `client_ip`, `source`, `version`)
          */
-//        mqList.add(orderVo.getOrderNo());
-//        mqList.add(orderVo.getUid());
-//        mqList.add(orderVo.getMode());
-//        mqList.add(orderVo.getPrice());
-//        mqList.add(BigDecimal.valueOf(0));
-//        mqList.add(orderVo.getMemberName());
-//        mqList.add(orderVo.getMemberId());
-//        mqList.add(orderVo.getMemberPriceId());
-//        mqList.add(orderVo.getDays());
-//        mqList.add(orderVo.getState());
-//        mqList.add(orderVo.getMemberNo());
-//        mqList.add(orderVo.getPayChannel());
-//        mqList.add(orderVo.getPayNo());
-//        mqList.add(orderVo.getBirthday());
-//        mqList.add(orderVo.getPaymentAt());
-//        mqList.add(orderVo.getCreatedAt());
-//        mqList.add(orderVo.getCreatedAt());
-//        mqList.add("ip");
 //        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
 //                SqlMapping.get("adam_member_order.add", mqList.toArray()));
         return true;
@@ -441,6 +429,18 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                     .updateOne(Query.query(Criteria.where("orderNo").is(orderVo.getOrderNo())).getQueryObject(), object);
 
             redisUtil.hset(AdamRedisConst.INFO_MEMBERS_ORDER_INFO.concat(orderVo.getUid()), orderVo.getOrderNo(), orderVo);
+
+            List<Object> mqList = AdamMemberOrderVo.getMemberOrderMqList(orderVo);
+        /*
+        ( `order_no`, `uid`, `mode`, `price`,
+         `price_paid`, `member_name`, `member_id`,
+         `member_price_id`, `days`, `state`, `member_no`,
+         `pay_channel`, `pay_no`, `birthday`, `payment_at`,
+         `created_at`, `updated_at`, `client_ip`, `source`, `version`)
+         */
+//            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                    SqlMapping.get("adam_member_order.add", mqList.toArray()));
+
         } catch (Exception e) {
             e.printStackTrace();
             return false;