会员API:添加配置支付回调地址;使用兑换码入参删除冗余属性;

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

@@ -6,10 +6,10 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码")
+@ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码入参")
 @Data
 public class AdamMemberOrderCodeParam implements Serializable {
-    private static final long serialVersionUID = 1298109732452201034L;
+    private static final long serialVersionUID = 2500742355642406263L;
     @ApiModelProperty(position = 10, required = true, value = "类型:2-会员码,3-礼包码", example = "3")
     private Integer type;
     @ApiModelProperty(position = 11, required = true, value = "兑换码", example = "0")
@@ -20,7 +20,4 @@ public class AdamMemberOrderCodeParam implements Serializable {
     private String name;
     @ApiModelProperty(position = 14, required = false, value = "身份证件号")
     private String idCard;
-    private String ip;
-    private String source;
-    private String version;
 }

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

@@ -7,10 +7,10 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-@ApiModel(value = "AdamMemberOrderParam", description = "入场人响应")
+@ApiModel(value = "AdamMemberOrderParam", description = "购买会员入参")
 @Data
 public class AdamMemberOrderParam implements Serializable {
-    private static final long serialVersionUID = 3219448286221952517L;
+    private static final long serialVersionUID = -2605176979349053352L;
     @ApiModelProperty(position = 10, required = true, value = "会员ID[50]")
     private String memberId;
     @ApiModelProperty(position = 11, required = true, value = "购买方式:0-购买会员,1-购买会员码", allowableValues = "0,1")
@@ -23,15 +23,15 @@ public class AdamMemberOrderParam implements Serializable {
     private String memberPriceId;
     @ApiModelProperty(position = 15, required = true, value = "支付方式", allowableValues = "ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP")
     private String payChannel;
-    @ApiModelProperty(position = 16, required = false, value = "支付用的productId")
+    @ApiModelProperty(position = 16, required = false, value = "苹果支付使用")
     private String productId;
     @ApiModelProperty(position = 17, required = false, value = "姓名", example = "王武")
     private String name;
     @ApiModelProperty(position = 18, required = false, value = "身份证件号", example = "111111111111111111")
     private String idCard;
-    @ApiModelProperty(position = 19, required = false, value = "支付用的AUTHCODE")
+    @ApiModelProperty(position = 19, required = false, value = "微信支付使用")
     private String authCode;
-    @ApiModelProperty(position = 20, required = false, value = "支付用的OPENID")
+    @ApiModelProperty(position = 20, required = false, value = "微信支付使用")
     private String openId;
     @ApiModelProperty(position = 21, required = true, value = "未支付/取消支付跳转URL")
     private String showUrl;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -248,7 +248,7 @@ create table adam_member_order
     mid             int unsigned auto_increment primary key,
     order_no        varchar(64),
     uid             varchar(64),
-    mode            tinyint comment '购买方式:0-购买会员 1-购买会员码,2-使用会员码',
+    mode            tinyint comment '购买方式:0-购买会员,1-购买会员码',
     price           decimal(8, 2) comment '原价',
     price_paid      decimal(8, 2) comment '实际支付',
     member_name     varchar(64),
@@ -263,7 +263,7 @@ create table adam_member_order
     payment_at      datetime default null comment '支付时间',
     created_at      datetime,
     updated_at      datetime,
-    client_ip       varchar(20),
+    client_ip       varchar(50),
     source          varchar(20),
     version         varchar(20)
 );

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

@@ -89,10 +89,6 @@ public class AdamMemberOrderController {
     @PostMapping("use/memberCode")
     public ResponseDto<AdamMemberOrder> useMemberCode(@RequestBody AdamMemberOrderCodeParam param) {
         try {
-            param.setIp("127.0.0.1");
-            param.setSource(CurrentUtil.getCliSource());
-            param.setVersion(CurrentUtil.getCliVersion());
-
             AdamRealInfoVo realInfoVo = adamRealNameService.queryByUid(CurrentUtil.getCurrentUid());
             if (null == realInfoVo) {
                 if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {

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

@@ -25,6 +25,7 @@ import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -39,6 +40,8 @@ import java.util.*;
 @Slf4j
 @Service
 public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderService {
+    @Autowired
+    Environment env;
     @Autowired
     IAdamRdmService adamRdmService;
     @Autowired
@@ -145,7 +148,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         orderVo.setState(AdamMemberConst.STATUS_UNPAID);
         orderVo.setUid(CurrentUtil.getCurrentUid());
         orderVo.setPrice(param.getPrice());
-        orderVo.setIp(CurrentUtil.getCliVersion());
+        orderVo.setIp(CurrentUtil.getCliIpAddr());
         orderVo.setVersion(CurrentUtil.getCliVersion());
         orderVo.setSource(CurrentUtil.getCliSource());
 
@@ -163,7 +166,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         payParam.add("name", orderVo.getMemberName());
         payParam.add("order_code", orderVo.getOrderNo());
         payParam.add("client_ip", "127.0.0.1");
-        payParam.add("notify_url", "http://www.baidu.com");
+        payParam.add("notify_url", env.getProperty("liquidnet.url-pay.callback"));
         payParam.add("create_date", createdAt);
         payParam.add("expire_time", AdamMemberConst.TIME_LIMIT.toString());
         if (null != param.getAuthCode()) {
@@ -280,9 +283,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName())
                 .updateOne(Query.query(Criteria.where("code").is(memberCodeVo.getCode())).getQueryObject(), object);
         // todo MQ 统一通知队列插入数据库
-        orderVo.setIp(param.getIp());
-        orderVo.setSource(param.getSource());
-        orderVo.setVersion(param.getVersion());
+        orderVo.setIp(CurrentUtil.getCliIpAddr());
+        orderVo.setSource(CurrentUtil.getCliSource());
+        orderVo.setVersion(CurrentUtil.getCliVersion());
         List<Object> mqList = AdamMemberOrderVo.getMemberOrderMqList(orderVo);
         /*
         ( `order_no`, `uid`, `mode`, `price`,
@@ -304,7 +307,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
      * @return Map
      */
     private Map callPayServer(String payType, LinkedMultiValueMap<String, String> payParam) {
-        String url = "http://testpay.zhengzai.tv";
+        String url = env.getProperty("liquidnet.url-pay.pay");
         switch (payType) {
             case "APPALIPAY":
                 url += "/app/alipay";