瀏覽代碼

退款优化

gongfuzhu 1 年之前
父節點
當前提交
8357ebe04b

+ 1 - 1
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/TuiPiaoRequest.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 public class TuiPiaoRequest extends DfyBaseData {
 
     // 订单ID
-    private Integer orderId;
+    private String orderId;
 
     // 退订类型
     private Integer causeType;

+ 0 - 3
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/dfy/TicketApi.java

@@ -126,9 +126,6 @@ public class TicketApi {
         String signature = Signature.getSignature(JSONUtil.parseObj(dfyRequestBase), secretKey);
         dfyRequestBase.setSign(signature);
 
-//        HttpRequest httpRequest = HttpRequest.post(host + url);
-//        String post = httpRequest.setHttpProxy(proxyHost, 3128)
-//                .timeout(-1).body(JSONUtil.toJsonStr(dfyRequestBase)).execute().body();
         String post = HttpUtil.post(host + url, JSONUtil.toJsonStr(dfyRequestBase));
         ApiLog apiLog = new ApiLog();
         apiLog.setSystem("Ticket");

+ 17 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/DfyTicketServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.helper.AuthHelper;
+import com.zhongshu.payment.client.model.order.v2.ApplicantRefundParam2Model;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
@@ -188,7 +189,22 @@ public class DfyTicketServiceImpl implements DfyTicketService {
 
 
     public ResultContent<TuiPiaoResponse> tuiPiao(TuiPiaoRequest tuiPiaoRequest) {
-        return ResultContent.buildContent(ticketApi.tuiPiao(tuiPiaoRequest));
+        ResultContent<List<GoodsResultModel>> listResultContent = orderService2.goodsDetail(tuiPiaoRequest.getOrderId());
+        GoodsResultModel goodsResultModel = listResultContent.getContent().get(0);
+        String extend = goodsResultModel.getExtend();
+        CreateOrderNewResponse.Datas bean = JSONUtil.toBean(extend, CreateOrderNewResponse.Datas.class);
+        Integer orderId = bean.getOrderId();
+        tuiPiaoRequest.setOrderId(String.valueOf(orderId));
+        TuiPiaoResponse tuiPiaoResponse = ticketApi.tuiPiao(tuiPiaoRequest);
+        if (tuiPiaoResponse.getSuccess()){
+            ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+            applicantRefundParam2Model.setUserId(authHelper.getCurrentUser().getUserId());
+            applicantRefundParam2Model.setId(goodsResultModel.getId());
+            applicantRefundParam2Model.setRemark(tuiPiaoResponse.getMsg());
+            paymentService2.applicantRefund(applicantRefundParam2Model);
+        }
+
+        return ResultContent.buildContent(tuiPiaoResponse);
 
     }