售后

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

@@ -154,15 +154,16 @@ public class GicOrderRefundController {
     public RestResponse<Object> auditRefund(String enterpriseId, String memberId,
             @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark,
             @RequestParam(defaultValue = "1") int step, RefundBaseQDTO baseQDTO, double applyRefundPrice) {
+        ServiceResponse<Void> resp = null;
         // 拒绝
         if (auditStatus == 1) {
             RefundRefusedQDTO qdto = EntityUtil.changeEntityNew(RefundRefusedQDTO.class, baseQDTO);
             qdto.setReason(remark);
             if (step == 1) {
-                this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
             }
             if (step == 2) {
-                this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto);
             }
         }
         // 同意
@@ -170,15 +171,18 @@ public class GicOrderRefundController {
             if (step == 1) {
                 RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityNew(RefundSellerAgreeQDTO.class, baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
-                this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
             }
             if (step == 2) {
                 RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityNew(RefundSellerConfirmGoodsQDTO.class,
                         baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
-                this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
             }
         }
+        if (!resp.isSuccess()) {
+            return RestResponse.failure(resp.getCode(), resp.getMessage());
+        }
         return RestResponse.successResult();
     }
 
@@ -191,15 +195,16 @@ public class GicOrderRefundController {
     public RestResponse<Object> auditExchange(String enterpriseId, String memberId,
             @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark, RefundBaseQDTO baseQDTO,
             ExchangeAddressQDTO address, @RequestParam(defaultValue = "1") int step) {
+        ServiceResponse<Void> resp = null;
         // 拒绝
         if (auditStatus == 1) {
             ExchangeRefusedQDTO qdto = EntityUtil.changeEntityNew(ExchangeRefusedQDTO.class, baseQDTO);
             qdto.setRemark(remark);
             if (step == 1) {
-                this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
             }
             if (step == 2) {
-                this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto);
             }
         }
         // 同意
@@ -208,12 +213,15 @@ public class GicOrderRefundController {
                     baseQDTO);
             if (step == 1) {
                 qdto.setExchangeAddress(address);
-                this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto);
             }
             if (step == 2) {
-                this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto);
             }
         }
+        if (!resp.isSuccess()) {
+            return RestResponse.failure(resp.getCode(), resp.getMessage());
+        }
         return RestResponse.successResult();
     }