gongfuzhu 1 year ago
parent
commit
d68b73f72f

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

@@ -20,6 +20,7 @@ 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.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -55,7 +56,7 @@ public class PaymentController {
     @RequestMapping(value = "applicantRefund", method = RequestMethod.POST)
     public ResultContent refund(@RequestBody @Valid ApplicantRefundParamModel applicantRefundParamModel) {
         ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
-        BeanUtils.copyProperties(applicantRefundParamModel,applicantRefundParam2Model);
+        BeanUtils.copyProperties(applicantRefundParamModel, applicantRefundParam2Model);
 
         return paymentServer.applicantRefund(applicantRefundParam2Model);
     }
@@ -66,7 +67,7 @@ public class PaymentController {
     @RequestMapping(value = "unRefund", method = RequestMethod.POST)
     public ResultContent unRefund(@RequestBody @Valid ApplicantRefundParamModel applicantRefundParamModel) {
         ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
-        BeanUtils.copyProperties(applicantRefundParamModel,applicantRefundParam2Model);
+        BeanUtils.copyProperties(applicantRefundParamModel, applicantRefundParam2Model);
         return paymentServer.unRefund(applicantRefundParam2Model);
     }
 
@@ -125,6 +126,7 @@ public class PaymentController {
     public ResultContent withdrawals() {
         return paymentServer.withdrawals();
     }
+
     @ApiOperation("提现订单列表")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
@@ -133,11 +135,12 @@ public class PaymentController {
     public ResultContent withdrawalsList(@RequestBody WithdrawRequestModel withdrawRequestModel) {
         return paymentServer.withdrawalsList(withdrawRequestModel);
     }
+
     @ApiOperation("确认分账")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
-    @RequestMapping(value = "subOrdersConfirm", method = RequestMethod.POST )
-    public ResultContent subOrdersConfirm(SubOrderModel subOrderModel) {
-        return paymentServer.subOrdersConfirm(subOrderModel.getGoodId(),subOrderModel.getUseShop());
+    @RequestMapping(value = "subOrdersConfirm", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResultContent subOrdersConfirm(@RequestBody SubOrderModel subOrderModel) {
+        return paymentServer.subOrdersConfirm(subOrderModel.getGoodId(), subOrderModel.getUseShop());
     }