售后

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

@@ -295,7 +295,7 @@ public class GicOrderController {
 
     // 我的客户-会员订单列表
     // deliveryChannel 0全部 1快递 2自提
-    // 1待付款 2待发货 7部分发货4 已完成0 已取消 5售后中
+    // 1待付款 2待发货 7部分发货 4已完成 0已取消 5售后中 
     @RequestMapping("list-member-order")
     public RestResponse<Object> orderList(String enterpriseId, String memberId, String search,
             @RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel,

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

@@ -28,6 +28,7 @@ import com.gic.business.order.qdto.aftersales.ExchangeSellerAgreeApplyQDTO;
 import com.gic.business.order.qdto.aftersales.RefundBaseQDTO;
 import com.gic.business.order.qdto.aftersales.RefundRefusedQDTO;
 import com.gic.business.order.qdto.aftersales.RefundSellerAgreeQDTO;
+import com.gic.business.order.qdto.aftersales.RefundSellerConfirmGoodsQDTO;
 import com.gic.business.order.qdto.ordermanage.RefundExchangeQDTO;
 import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
 import com.gic.business.order.service.ordermanage.OrderRefundApiService;
@@ -86,7 +87,7 @@ public class GicOrderRefundController {
     public RestResponse<Object> exchangeDetail(String orderExchangeId) {
         ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
         OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, resp.getResult());
-        String targetProSkuId = resp.getResult().getTargetProSkuId() ;
+        String targetProSkuId = resp.getResult().getTargetProSkuId();
         // 查询库存
         vo.setTargetProStock(1);
         return RestResponse.successResult(vo);
@@ -113,12 +114,15 @@ public class GicOrderRefundController {
         }
         // 同意
         if (auditStatus == 2) {
-            RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityNew(RefundSellerAgreeQDTO.class, baseQDTO);
-            qdto.setApplyRefundPrice(applyRefundPrice);
             if (step == 1) {
+                RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityNew(RefundSellerAgreeQDTO.class, baseQDTO);
+                qdto.setApplyRefundPrice(applyRefundPrice);
                 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);
             }
         }