更新权益订单返回对象

share-front/src/main/java/share/web/controller/system/EquityMembersOrderController.java

@@ -16,7 +16,7 @@ import share.common.utils.poi.ExcelUtil;
 import share.system.domain.EquityMembersOrder;
 import share.system.domain.vo.EquityMembersOrderVo;
 import share.system.request.CreateEquityMembersRequest;
-import share.system.response.RechargePayResultResponse;
+import share.system.response.EquityMembersResultResponse;
 import share.system.service.EquityMembersOrderService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -94,11 +94,11 @@ public class EquityMembersOrderController extends BaseController {
     }
 
     @PostMapping("/createEquityMembers")
-    public R<RechargePayResultResponse> createOrder(@RequestBody @Validated CreateEquityMembersRequest request) {
+    public R<EquityMembersResultResponse> createOrder(@RequestBody @Validated CreateEquityMembersRequest request) {
         if ("1".equals(redisUtil.frontInOutLogSwitch())) {
             log.info("SOrderController method preOrder 入参  {}", JsonConvertUtil.write2JsonStr(request));
         }
-        RechargePayResultResponse response = equityMembersOrderService.createEquityMembers(request);
+        EquityMembersResultResponse response = equityMembersOrderService.createEquityMembers(request);
         if ("1".equals(redisUtil.frontInOutLogSwitch())) {
             log.info("SOrderController method preOrder 出参  {}", JsonConvertUtil.write2JsonStr(response));
         }

share-system/src/main/java/share/system/response/EquityMembersResultResponse.java

+package share.system.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import share.system.domain.vo.WxPayJsResultVo;
+
+/**
+ * 订单支付结果 Response
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "EquityMembersResultResponse对象", description = "订单支付结果响应对象")
+public class EquityMembersResultResponse {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "支付状态")
+    private Boolean status;
+
+    @ApiModelProperty(value = "微信调起支付参数对象")
+    private WxPayJsResultVo jsConfig;
+
+    @ApiModelProperty(value = "支付类型")
+    private String payType;
+
+    @ApiModelProperty(value = "订单编号")
+    private String rechargeNo;
+
+    @ApiModelProperty(value = "微信支付回调的url")
+    private String notifyUrl;
+}

share-system/src/main/java/share/system/service/EquityMembersOrderService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.EquityMembersOrder;
 import share.system.domain.vo.EquityMembersOrderVo;
 import share.system.request.CreateEquityMembersRequest;
-import share.system.response.RechargePayResultResponse;
+import share.system.response.EquityMembersResultResponse;
 
 import java.util.List;
 
@@ -63,7 +63,7 @@ public interface EquityMembersOrderService extends IService<EquityMembersOrder>
      */
     public int deleteEquityMembersOrderById(Long id);
 
-    RechargePayResultResponse createEquityMembers(CreateEquityMembersRequest request);
+    EquityMembersResultResponse createEquityMembers(CreateEquityMembersRequest request);
 
     EquityMembersOrder getInfoByEntity(EquityMembersOrder equityMembersOrderParam);
 

share-system/src/main/java/share/system/service/OrderPayService.java

@@ -3,6 +3,7 @@ package share.system.service;
 import share.system.domain.EquityMembersOrder;
 import share.system.domain.Recharge;
 import share.system.domain.SOrder;
+import share.system.response.EquityMembersResultResponse;
 import share.system.response.OrderPayResultResponse;
 import share.system.response.RechargePayResultResponse;
 
@@ -33,6 +34,6 @@ public interface OrderPayService {
      */
     RechargePayResultResponse saobeiRechargePayment(Recharge recharge);
 
-    RechargePayResultResponse saobeiEquityMembersOrderPayment(EquityMembersOrder equityMembersOrder);
+    EquityMembersResultResponse saobeiEquityMembersOrderPayment(EquityMembersOrder equityMembersOrder);
 
 }

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -20,7 +20,7 @@ import share.system.domain.vo.EquityMembersOrderVo;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.mapper.EquityMembersOrderMapper;
 import share.system.request.CreateEquityMembersRequest;
-import share.system.response.RechargePayResultResponse;
+import share.system.response.EquityMembersResultResponse;
 import share.system.service.*;
 
 import java.util.Date;
@@ -120,7 +120,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
     }
 
     @Override
-    public RechargePayResultResponse createEquityMembers(CreateEquityMembersRequest request) {
+    public EquityMembersResultResponse createEquityMembers(CreateEquityMembersRequest request) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         if (ObjectUtil.isNull(user)) {
             throw new BaseException("您的登录已过期，请先登录");
@@ -133,7 +133,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
         }
         EquityMembersOrder equityMembersOrder = generatEquityMembersOrder(request, user);
         save(equityMembersOrder);
-        RechargePayResultResponse response = orderPayService.saobeiEquityMembersOrderPayment(equityMembersOrder);
+        EquityMembersResultResponse response = orderPayService.saobeiEquityMembersOrderPayment(equityMembersOrder);
         return response;
     }
 

share-system/src/main/java/share/system/service/impl/OrderPayServiceImpl.java

@@ -25,6 +25,7 @@ import share.system.domain.Recharge;
 import share.system.domain.SConsumerToken;
 import share.system.domain.SOrder;
 import share.system.domain.vo.*;
+import share.system.response.EquityMembersResultResponse;
 import share.system.response.OrderPayResultResponse;
 import share.system.response.RechargePayResultResponse;
 import share.system.service.*;
@@ -334,8 +335,8 @@ public class OrderPayServiceImpl implements OrderPayService {
      * @return
      */
     @Override
-    public RechargePayResultResponse saobeiEquityMembersOrderPayment(EquityMembersOrder equityMembersOrder) {
-        RechargePayResultResponse response = new RechargePayResultResponse();
+    public EquityMembersResultResponse saobeiEquityMembersOrderPayment(EquityMembersOrder equityMembersOrder) {
+        EquityMembersResultResponse response = new EquityMembersResultResponse();
         response.setRechargeNo(equityMembersOrder.getEquityOrderNo());
         response.setPayType(PayTypeEnum.getEnumByCode(equityMembersOrder.getPayType().intValue()).getValue());
         response.setStatus(YesNoEnum.no.getFlag());