兑换会员+收获地址逻辑;

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

@@ -23,10 +23,14 @@ public class AdamMemberOrderCodeParam implements Serializable {
     @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
     @NotBlank(message = "生日不能为空")
     private String birthday;
-    @ApiModelProperty(position = 12, value = "支付终端[app,wap,js,applet]", example = "js")
+    @ApiModelProperty(position = 13, required = true, value = "收获地址")
+    @Size(min = 1, max = 64, message = "收获地址长度限制1-64位字符")
+    @NotBlank(message = "收获地址不能为空")
+    private String addressId;
+    @ApiModelProperty(position = 14, value = "支付终端[app,wap,js,applet]", example = "js")
     private String deviceFrom;
-    @ApiModelProperty(position = 13, required = false, value = "姓名[未实名时必传]")
+    @ApiModelProperty(position = 15, required = false, value = "姓名[未实名时必传]")
     private String name;
-    @ApiModelProperty(position = 14, required = false, value = "身份证件号[未实名时必传]")
+    @ApiModelProperty(position = 16, required = false, value = "身份证件号[未实名时必传]")
     private String idCard;
 }

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

@@ -16,22 +16,26 @@ public interface IAdamMemberOrderService {
      * 购买会员或会员码
      *
      * @param uid
-     * @param param
+     * @param param AdamMemberOrderParam
+     * @return ResponseDto<AdamMemberOrderResult>
      */
     ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(String uid, AdamMemberOrderParam param);
 
     /**
      * 支付回调
+     *
      * @return
      */
     ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter);
 
     /**
      * 使用会员码
-     * @param param
-     * @return
+     *
+     * @param uid
+     * @param param AdamMemberOrderCodeParam
+     * @return ResponseDto<AdamMemberOrderResult>
      */
-    ResponseDto<AdamMemberOrderResult> exchangeMemberCode(AdamMemberOrderCodeParam param);
+    ResponseDto<AdamMemberOrderResult> exchangeMemberCode(String uid, AdamMemberOrderCodeParam param);
 
     /**
      * 查取会员订单列表

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

@@ -224,7 +224,7 @@ public class AdamMemberOrderController {
             }
         }
 
-        return adamMemberOrderService.exchangeMemberCode(param);
+        return adamMemberOrderService.exchangeMemberCode(currentUid, param);
     }
 
     @ApiOperationSupport(order = 5)

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

@@ -318,7 +318,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             });
 
             AdamMemberOrderExtVo memberOrderExtVo = handleMemberOrderVo.getExtendVo();
-            if (null != memberOrderExtVo) {
+//            if (null != memberOrderExtVo) {
                 toMqSqls.add(SqlMapping.get("adam_member_order_ext.add"));
                 initMemberOrderExtObjs.add(new Object[]{
                         memberOrderExtVo.getOrderNo(), memberOrderExtVo.getExpressStatus(), memberOrderExtVo.getExpressReceiver(),
@@ -330,14 +330,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                         SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs)
                 );
                 log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
-            } else {
-                s = System.currentTimeMillis();
-                queueUtils.sendMsgByRedis(
-                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs)
-                );
-                log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
-            }
+//            } else {
+//                s = System.currentTimeMillis();
+//                queueUtils.sendMsgByRedis(
+//                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+//                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs)
+//                );
+//                log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+//            }
 
             return ResponseDto.success();
         } catch (Exception e) {
@@ -367,7 +367,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
     }
 
     @Override
-    public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(AdamMemberOrderCodeParam param) {
+    public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(String currentUid, AdamMemberOrderCodeParam param) {
+        AdamAddressesVo addressesVo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, param.getAddressId());
+        if (null == addressesVo) {
+            return ResponseDto.failure(ErrorMapping.get("10106"));
+        }
         AdamMemberCodeVo memberCodeVo = adamRdmService.getMemberCodeVoByCode(param.getMemberCode());
         if (null == memberCodeVo) {
             return ResponseDto.failure(ErrorMapping.get("10207"));
@@ -392,7 +396,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             // 创建会员订单
             initMemberOrderVo = AdamMemberOrderVo.getNew();
             initMemberOrderVo.setOrderNo(IDGenerator.nextSnowId().concat("V"));
-            initMemberOrderVo.setUid(CurrentUtil.getCurrentUid());
+            initMemberOrderVo.setUid(currentUid);
             initMemberOrderVo.setMode(param.getMode());
             initMemberOrderVo.setPrice(memberPriceVo.getPrice());
             initMemberOrderVo.setPricePaid(BigDecimal.ZERO);
@@ -413,10 +417,20 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             initMemberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
             initMemberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion);
 
+            AdamMemberOrderExtVo memberOrderExtVo = AdamMemberOrderExtVo.getNew();
+            memberOrderExtVo.setOrderNo(initMemberOrderVo.getOrderNo());
+            memberOrderExtVo.setExpressStatus(-1);
+            memberOrderExtVo.setExpressReceiver(addressesVo.getName());
+            memberOrderExtVo.setExpressPhone(addressesVo.getPhone());
+            memberOrderExtVo.setExpressAddress(addressesVo.getProvince() + addressesVo.getCity() + addressesVo.getCounty() + addressesVo.getAddress());
+
+            initMemberOrderVo.setExtendVo(memberOrderExtVo);
+
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> updateMemberCodeObjs = CollectionUtil.linkedListObjectArr(),
                     initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
-                    upsertUserMemberObjs = CollectionUtil.linkedListObjectArr();
+                    upsertUserMemberObjs = CollectionUtil.linkedListObjectArr(),
+                    initMemberOrderExtObjs = CollectionUtil.linkedListObjectArr();
             existUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
             if (null != existUserMemberVo) {// 已是会员
                 AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew();
@@ -473,10 +487,16 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     initMemberOrderVo.getClientIp(), initMemberOrderVo.getSource(), initMemberOrderVo.getVersion()
             });
 
+            toMqSqls.add(SqlMapping.get("adam_member_order_ext.add"));
+            initMemberOrderExtObjs.add(new Object[]{
+                    memberOrderExtVo.getOrderNo(), memberOrderExtVo.getExpressStatus(), memberOrderExtVo.getExpressReceiver(),
+                    memberOrderExtVo.getExpressPhone(), memberOrderExtVo.getExpressAddress()
+            });
+
             s = System.currentTimeMillis();
             queueUtils.sendMsgByRedis(
                     MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                    SqlMapping.gets(toMqSqls, upsertUserMemberObjs, updateMemberCodeObjs, initMemberOrderObjs)
+                    SqlMapping.gets(toMqSqls, upsertUserMemberObjs, updateMemberCodeObjs, initMemberOrderObjs, initMemberOrderExtObjs)
             );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
         } catch (Exception e) {