购买会员+paymentId记录

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

@@ -40,29 +40,31 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
     private String deviceFrom;
     @ApiModelProperty(position = 11, value = "支付方式", allowableValues = "alipay,wepay")
     private String payType;
-    @ApiModelProperty(position = 12, value = "支付单号")
+    @ApiModelProperty(position = 12, value = "支付中心支付CODE")
     private String payNo;
-    @ApiModelProperty(position = 13, value = "支付时间")
+    @ApiModelProperty(position = 13, value = "支付中心三方支付ID")
+    private String paymentId;
+    @ApiModelProperty(position = 14, value = "支付时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime paymentAt;
-    @ApiModelProperty(position = 14, value = "创建时间")
+    @ApiModelProperty(position = 15, value = "创建时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
-    @ApiModelProperty(position = 15, value = "创建时间")
+    @ApiModelProperty(position = 16, value = "创建时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
-    @ApiModelProperty(position = 16, value = "价格")
+    @ApiModelProperty(position = 17, value = "价格")
     private BigDecimal price;
-    @ApiModelProperty(position = 17, value = "实付价格")
+    @ApiModelProperty(position = 18, value = "实付价格")
     private BigDecimal pricePaid;
-    @ApiModelProperty(position = 18, value = "客户端IP")
+    @ApiModelProperty(position = 19, value = "客户端IP")
     private String clientIp;
-    @ApiModelProperty(position = 19, value = "客户端来源")
+    @ApiModelProperty(position = 20, value = "客户端来源")
     private String source;
-    @ApiModelProperty(position = 20, value = "客户端版本")
+    @ApiModelProperty(position = 21, value = "客户端版本")
     private String version;
 
-    @ApiModelProperty(position = 21, value = "会员订单扩展信息")
+    @ApiModelProperty(position = 22, value = "会员订单扩展信息")
     private AdamMemberOrderExtVo extendVo;
 
     @ApiModelProperty(position = 30, value = "会员须知")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.MemberOrderDto;
 import com.liquidnet.service.adam.dto.param.admin.AdamMemberOrderRefundParam;
@@ -17,6 +18,7 @@ import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
 import com.liquidnet.service.adam.entity.*;
 import com.liquidnet.service.adam.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
@@ -49,6 +51,11 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
     @Autowired
     private AdamMemberOrderExtMapper adamMemberOrderExtMapper;
 
+    @Value("${liquidnet.url-refund.apply}")
+    private String applyUrl;
+    @Value("${liquidnet.url-refund.notify}")
+    private String notifyUrl;
+
     @Override
     public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
         Map<String, Object> reqParamMap = new HashMap<>();
@@ -106,17 +113,21 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
     @Override
     @Transactional
     public boolean refundProcessing(AdamMemberOrderRefundParam param, AdamMemberOrder memberOrder) {
-        LinkedMultiValueMap<String, Object> linkedMultiValueMap = new LinkedMultiValueMap<>();
+        LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>();
 
         linkedMultiValueMap.add("code", memberOrder.getPayNo());
-        linkedMultiValueMap.add("notifyUrl", null);
+        linkedMultiValueMap.add("notifyUrl", notifyUrl);
         linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
         linkedMultiValueMap.add("orderRefundCode", IDGenerator.nextTimeId2());
         linkedMultiValueMap.add("paymentId", null);
         linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
-        linkedMultiValueMap.add("price", param.getRefundAmt());
-        linkedMultiValueMap.add("priceTotal", memberOrder.getPricePaid());
+        linkedMultiValueMap.add("price", String.valueOf(param.getRefundAmt()));
+        linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));
         linkedMultiValueMap.add("reason", param.getReason());
+
+//        String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap);
+
+
         return true;
     }
 

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

@@ -75,9 +75,13 @@ public class AdamMemberOrder implements Serializable {
      */
     private String payType;
     /**
-     * 支付单号
+     * 支付中心支付CODE
      */
     private String payNo;
+    /**
+     * 支付中心三方支付ID
+     */
+    private String paymentId;
     /**
      * 支付时间
      */