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

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,6 +16,7 @@ public class AdamMemberOrderCallbackParam implements Serializable {
     @JsonProperty("order_code")
     private String orderCode;
     private String code;
+    @ApiModelProperty(value = "[VIP,CLUB]", allowableValues = "VIP,CLUB")
     private String type;
     private BigDecimal price;
     @JsonProperty("payment_type")

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

 package com.liquidnet.service.adam.dto;
 
-import com.liquidnet.commons.lang.constant.LnsRegex;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码入参")
@@ -20,9 +22,9 @@ public class AdamMemberOrderCodeParam implements Serializable {
     @ApiModelProperty(position = 11, required = true, value = "兑换码", example = "0")
     @NotBlank
     private String memberCode;
-    @ApiModelProperty(position = 12, required = true, value = "生日", example = "2021-05-27")
-    @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "时间格式有误")
-    private String birthday;
+    @ApiModelProperty(position = 12, value = "支付终端[app,wap,js,applet]", example = "js")
+    private String deviceFrom;
+
     @ApiModelProperty(position = 13, required = false, value = "姓名")
     private String name;
     @ApiModelProperty(position = 14, required = false, value = "身份证件号")

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

@@ -16,8 +16,8 @@ public class AdamMemberCodeVo implements Serializable, Cloneable {
     private String memberId;
     @ApiModelProperty(position = 2, value = "会员价格id")
     private String memberPriceId;
-    @ApiModelProperty(position = 3, value = "类型:0-购买,1-后台生成")
-    private String type;
+    @ApiModelProperty(position = 3, value = "类型:1-购买,2-赠送(后台生成)")
+    private Integer type;
     @ApiModelProperty(position = 4, value = "会员编号")
     private String memberNo;
     @ApiModelProperty(position = 5, value = "状态:0-未使用,1-已使用,2-不可用")

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

@@ -41,13 +41,17 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
     private String paymentAt;
     @ApiModelProperty(position = 13, value = "创建时间")
     private String createdAt;
-    @ApiModelProperty(position = 14, value = "价格")
+    @ApiModelProperty(position = 14, value = "创建时间")
+    private String updatedAt;
+    @ApiModelProperty(position = 15, value = "价格")
     private BigDecimal price;
-    @ApiModelProperty(position = 15, value = "客户端IP")
-    private String ip;
-    @ApiModelProperty(position = 16, value = "客户端来源")
+    @ApiModelProperty(position = 16, value = "实付价格")
+    private BigDecimal pricePaid;
+    @ApiModelProperty(position = 17, value = "客户端IP")
+    private String clientIp;
+    @ApiModelProperty(position = 18, value = "客户端来源")
     private String source;
-    @ApiModelProperty(position = 17, value = "客户端版本")
+    @ApiModelProperty(position = 19, value = "客户端版本")
     private String version;
 
     @ApiModelProperty(position = 20, value = "兑换码")
@@ -63,29 +67,4 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
         }
         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.getDeviceFrom());
-        mqList.add(orderVo.getPayType());
-        mqList.add(orderVo.getPayNo());
-        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-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java

@@ -22,6 +22,12 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      */
     ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param) throws Exception;
 
+    /**
+     * 支付回调
+     * @return
+     */
+    ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter);
+
     /**
      * 使用会员码
      * @param param
@@ -44,10 +50,4 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      */
     AdamMemberOrderVo getMemberOrderInfo(String uid,String orderNo);
 
-    /**
-     * 支付回调
-     * @return
-     */
-    ResponseDto<Object> memberNotifyCallBack(AdamMemberOrderCallbackParam parameter);
-
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCode.java

@@ -21,7 +21,7 @@ public class AdamMemberCode {
      */
     private String code;
     /**
-     * 类型 0-用户购买兑换码 1-后台生成兑换码
+     * 类型:1-购买,2-赠送(后台生成)
      */
     private Integer type;
     /**

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberOrder.java

@@ -63,9 +63,13 @@ public class AdamMemberOrder implements Serializable {
      */
     private String memberNo;
     /**
-     * 支付渠道
+     * 支付终端:app,wap,js,applet
      */
-    private String payChannel;
+    private String deviceFrom;
+    /**
+     * 支付方式:alipay,wepay,vipcode,giftcode
+     */
+    private String payType;
     /**
      * 支付单号
      */
@@ -74,10 +78,8 @@ public class AdamMemberOrder implements Serializable {
      * 支付时间
      */
     private LocalDateTime paymentAt;
-    /**
-     * 用户生日
-     */
-    private LocalDateTime birthday;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
     /**
      * ip地址
      */
@@ -90,9 +92,7 @@ public class AdamMemberOrder implements Serializable {
      * 客户端版本号
      */
     private String version;
-
-    private LocalDateTime createdAt;
-    private LocalDateTime updatedAt;
+    private String comment;
 
 
 }

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

@@ -260,9 +260,8 @@ create table adam_member_order
     state           tinyint comment '订单状态',
     member_no       varchar(20) comment '会员号',
     device_from     varchar(20) comment '支付终端:app,wap,js,applet',
-    pay_type        varchar(20) comment '支付方式:alipay,wepay',
+    pay_type        varchar(20) comment '支付方式:alipay,wepay,vipcode,giftcode',
     pay_no          varchar(64) comment '支付订单',
-    birthday        date     default null comment '用户生日',
     payment_at      datetime default null comment '支付时间',
     created_at      datetime,
     updated_at      datetime,
@@ -291,7 +290,7 @@ create table adam_member_code
 (
     mid             int unsigned auto_increment primary key,
     code            varchar(20) comment '会员码',
-    type            int          default 0 comment '0用户购买1提前制作',
+    type            int          default 0 comment '类型:1-购买,2-赠送(后台生成)',
     member_id       varchar(255) comment '会员ID',
     member_price_id varchar(255) comment '会员价格ID',
     member_no       varchar(20) comment '预留会员号',

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

@@ -106,10 +106,10 @@ public class AdamMemberOrderController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "会员支付回调")
     @PostMapping("callback")
-    public String paymentCallBack(@ModelAttribute AdamMemberOrderCallbackParam parameter){
+    public String paymentNotifyCallBack(@ModelAttribute AdamMemberOrderCallbackParam parameter){
         log.debug("/member/callback.parameter:{}", JsonUtils.toJson(parameter));
         if (1 != parameter.getStatus() ||
-                !parameter.getType().equals(AdamMemberConst.TYPE_VIP) ||
+                !parameter.getType().equals("VIP") ||
                 null == parameter.getOrderCode() ||
                 null == parameter.getCode()) {
             log.error("会员支付回调参数有误:{}", JsonUtils.toJson(parameter));
@@ -117,7 +117,7 @@ public class AdamMemberOrderController {
             return "fail";
         }
 
-        ResponseDto<Object> dto = adamMemberOrderService.memberNotifyCallBack(parameter);
+        ResponseDto<Object> dto = adamMemberOrderService.paymentNotifyCallBack(parameter);
 
         if (!dto.isSuccess()) {
             log.warn("###会员支付回调处理失败:handleDto:{},CallbackParam:{}", JsonUtils.toJson(dto), JsonUtils.toJson(parameter));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -12,21 +12,6 @@ adam_real_name.add=INSERT INTO adam_real_name (real_name_id, `uid`, `type`, `nam
 adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at) values (?,?,?,?,?,?,?) 
 adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? AND `state`=1
 
-# ----------------------------------------------------
-adam_member.add=INSERT INTO adam_member ( `name`, `title`, `sub_title`, `icon`, `avatar`, `start_no`, `type`, `interests_detail`, `notes`, `is_notice`, `notice_info`, `notice_title`, `need_question`, `display_agreement`, `agreement`, `member_id`, `limitation`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
-
-# ----------------------------------------------------
-adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, device_from, pay_type, pay_no, birthday, payment_at, created_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
-adam_member_order.update=UPDATE adam_member_order SET `state` =?, member_no =?, payment_at =?, updated_at =? WHERE order_no =? 
-
-# ----------------------------------------------------
-adam_member_code.add=INSERT INTO adam_member_code (code, `type`, member_id, member_price_id, member_no, `state`, created_at, buy_order_no, buy_uid, buy_at) VALUES (?,?,?,?,?,?,?,?,?,?) 
-adam_member_code.exchange=UPDATE adam_member_code SET `state`=?, updated_at=?, use_order_no=?, use_uid=?, use_at=? WHERE code=? 
-
-# ----------------------------------------------------
-adam_user_member.add=INSERT INTO adam_user_member (`uid`, member_id, member_no, `state`, expiry_at, created_at) VALUES (?,?,?,?,?,?) 
-adam_user_member.update=UPDATE adam_user_member SET `state`=?, expiry_at=?, updated_at=? WHERE `uid`=? 
-
 # ----------------------------------------------------
 adam_addresses.add=
 adam_addresses.edit=
@@ -40,10 +25,24 @@ adam_enters.update.is_default=UPDATE adam_enters set is_default=?, updated_at=?
 adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
 
 # ----------------------------------------------------
+adam_member.add=INSERT INTO adam_member ( `name`, `title`, `sub_title`, `icon`, `avatar`, `start_no`, `type`, `interests_detail`, `notes`, `is_notice`, `notice_info`, `notice_title`, `need_question`, `display_agreement`, `agreement`, `member_id`, `limitation`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+
+# ----------------------------------------------------
+adam_member_code.add=INSERT INTO adam_member_code (code, `type`, member_id, member_price_id, member_no, `state`, created_at, buy_order_no, buy_uid, buy_at) VALUES (?,?,?,?,?,?,?,?,?,?) 
+adam_member_code.exchange=UPDATE adam_member_code SET `state`=?, updated_at=?, use_order_no=?, use_uid=?, use_at=? WHERE code=? 
+
+# ----------------------------------------------------
+adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, device_from, pay_type, pay_no, payment_at, created_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+adam_member_order.update=UPDATE adam_member_order SET `state`=?, member_no=?, payment_at=?, updated_at=? WHERE order_no=? 
 
+# ----------------------------------------------------
+adam_user_member.add=INSERT INTO adam_user_member (`uid`, member_id, member_no, `state`, expiry_at, created_at) VALUES (?,?,?,?,?,?) 
+adam_user_member.update=UPDATE adam_user_member SET `state`=?, expiry_at=?, updated_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
 
 
+# ----------------------------------------------------
+
 
 # ----------------------------------------------------
\ No newline at end of file