gongfuzhu 1 anno fa
parent
commit
9d951a7016

+ 10 - 3
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/PaymentController.java

@@ -6,6 +6,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.payment.client.model.Pages;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
+import com.zhongshu.payment.client.model.order.ApplicantRefundParamModel;
 import com.zhongshu.payment.client.model.order.v2.ApplicantRefundParam2Model;
 import com.zhongshu.payment.client.model.order.v2.RefundParam2Model;
 import com.zhongshu.payment.client.model.order.v2.TransferModel;
@@ -16,6 +17,7 @@ import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
 import com.zswl.cloud.springBtach.server.core.service.PaymentService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -52,15 +54,20 @@ public class PaymentController {
     @ApiOperation("退款申请")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "applicantRefund", method = RequestMethod.POST)
-    public ResultContent refund(@RequestBody @Valid ApplicantRefundParam2Model applicantRefundParamModel) {
-        return paymentServer.applicantRefund(applicantRefundParamModel);
+    public ResultContent refund(@RequestBody @Valid ApplicantRefundParamModel applicantRefundParamModel) {
+        ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+        BeanUtils.copyProperties(applicantRefundParamModel,applicantRefundParam2Model);
+
+        return paymentServer.applicantRefund(applicantRefundParam2Model);
     }
 
 
     @ApiOperation("取消退款")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "unRefund", method = RequestMethod.POST)
-    public ResultContent unRefund(@RequestBody @Valid ApplicantRefundParam2Model applicantRefundParam2Model) {
+    public ResultContent unRefund(@RequestBody @Valid ApplicantRefundParamModel applicantRefundParamModel) {
+        ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+        BeanUtils.copyProperties(applicantRefundParamModel,applicantRefundParam2Model);
         return paymentServer.unRefund(applicantRefundParam2Model);
     }