海博退款单模块

yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ReturnMoneyStsType.java

@@ -5,37 +5,36 @@ public enum ReturnMoneyStsType {
     /**
      * 退款申请中
      */
-    APPLY(1),
+    APPLY(10),
 
     /**
      * 卖家处理退款
      */
-    PROCESSING(2),
+    PROCESSING(20),
 
     /**
      * 买家已发货
      */
-    CONSIGNMENT(3),
+    CONSIGNMENT(60),
 
     /**
-     * 卖家已收货
+     * 待确认收货（二审待审核）
      */
-    RECEIVE(4),
-
+    RECEIVE(65),
     /**
      * 退款成功
      */
-    SUCCESS(5),
+    SUCCESS(70),
 
     /**
      * 客户撤回退款申请
      */
-    CANCEL(6),
+    CANCEL(40),
 
     /**
      * 商家拒绝
      */
-    REJECT(7),
+    REJECT(30),
 
     /**
      * 退款关闭

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopSkuController.java

@@ -14,6 +14,7 @@ import com.yami.shop.service.ShopSkuService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+
 /**
  * 门店对应商品价格和库存管理
  *

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -219,19 +219,26 @@ public class HBOrderService implements IHBOrderService {
             orderRefundParam.setBuyerReason("17");
             orderRefundParam.setBuyerDesc(bodyJson.getString("remark"));
             orderRefundParam.setBuyerMobile(order.getUserMobile());
+            orderRefundParam.setGoodsNum(order.getProductNums());
+            orderRefundParam.setRefundAmount(order.getActualTotal());
             orderRefundParam.setPhotoFiles("");
 
-//            List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
-//            OrderRefundSku orderRefundSku = new OrderRefundSku();
-//            orderRefundSku.setOrderItemId(order.getOrderItem().getId());
-//            orderRefundSku.setSkuId(order.getOrderItem().getSkuId());
-//            orderRefundSku.setProductCount(order.getOrderItem().getProductCount());
-//            orderRefundSku.setSkuPrice(order.getOrderItem().getSkuPrice());
-//            orderRefundSkuList.add(orderRefundSku);
-//            orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
-            applyAgain(orderRefundParam);
-
-            //
+            List<OrderItem> listByOrderNumber = orderItemMapper.getListByOrderNumber(order.getOrderNumber());
+            List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
+            for (OrderItem orderItem : listByOrderNumber) {
+                OrderRefundSku orderRefundSku = new OrderRefundSku();
+                orderRefundSku.setOrderItemId(orderItem.getOrderItemId());
+                orderRefundSku.setSkuId(orderItem.getSkuId());
+                orderRefundSku.setProductCount(orderItem.getProdCount());
+                orderRefundSku.setSkuPrice(orderItem.getPrice());
+                orderRefundSkuList.add(orderRefundSku);
+                orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
+            }
+
+
+            String afterSaleOrder = applyAgain(orderRefundParam);
+            orderRefundService.createRefundOrder(order.getOrderNumber(), afterSaleOrder);
+
         }
         //成功直接通知海博
         if (operatorType == 70) {
@@ -500,7 +507,7 @@ public class HBOrderService implements IHBOrderService {
      * @param orderRefundParam 退款单数据
      * @return
      */
-    private ResponseEntity<String> applyAgain(OrderRefundParam orderRefundParam) {
+    private String applyAgain(OrderRefundParam orderRefundParam) {
         log.info(" 海博申请退款参数:{}", JSONObject.toJSONString(orderRefundParam));
         List<OrderRefundSku> orderRefundSkuList = orderRefundParam.getOrderRefundSkuList();
 
@@ -607,7 +614,6 @@ public class HBOrderService implements IHBOrderService {
         newOrderRefund.setOrderNumber(order.getOrderNumber());
         newOrderRefund.setRefundSn(String.valueOf(snowflake.nextId()));
         newOrderRefund.setRefundType(orderRefundParam.getRefundType());
-
         newOrderRefund.setRefundAmount(orderRefundParam.getRefundAmount());
 
 
@@ -636,7 +642,7 @@ public class HBOrderService implements IHBOrderService {
 
 //        orderRefundService.removeById(refundId);
 //        orderRefundSkuMapper.delete(new LambdaQueryWrapper<OrderRefundSku>().eq(OrderRefundSku::getOrderRefundId,refundId));
-        return ResponseEntity.ok(newOrderRefund.getRefundSn());
+        return newOrderRefund.getRefundSn();
     }
 
 

yami-shop-service/src/main/java/com/yami/shop/service/impl/ChannelProdServiceImpl.java

@@ -324,7 +324,7 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
         }
         return String.format("导入完成，成功：%d条", successCount);
     }
-
+    // ... existing code ...
     @Override
     public void exportChannelProds(ChannelProd channelProd, HttpServletResponse response) {
         // 查询数据
@@ -334,7 +334,14 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
 
         // 转换为导出VO
         List<ChannelProdExportVO> exportData = dataList.stream().map(item -> {
-            return new ChannelProdExportVO();
+            ChannelProdExportVO exportVO = new ChannelProdExportVO();
+            exportVO.setSkuId(String.valueOf(item.getSkuId()));
+            exportVO.setChannelName(item.getChannelName());
+            exportVO.setShopName(item.getShopName());
+            exportVO.setPurchasePrice(item.getPurchasePrice());
+            exportVO.setDeliveryPrice(item.getDeliveryPrice());
+            exportVO.setChannelProdPrice(item.getChannelProdPrice());
+            return exportVO;
         }).collect(Collectors.toList());
         try {
             // 设置响应头
@@ -352,6 +359,7 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
             e.printStackTrace();
         }
     }
+// ... existing code ...
 
     @Override
     public void setUpChannels(UpdateShannerProdDTO updateShannerProdDTO) {

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1013,7 +1013,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
 
             thirdPartyRefundRequest.setPickAddress(orderRefund.getBuyerMobile());
             thirdPartyRefundRequest.setRefundType(orderRefund.getRefundType());
-            thirdPartyRefundRequest.setMoney((long) (orderRefund.getRefundAmount() * 100));
+            thirdPartyRefundRequest.setMoney((long) (orderRefund.getRefundAmount() == null ? 0 : orderRefund.getRefundAmount() * 100));
             thirdPartyRefundRequest.setTimestamp(orderRefund.getApplyTime().getTime());
             thirdPartyRefundRequest.setRefundSource(1);
 
@@ -1027,7 +1027,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 productRequest.setChannelSkuId(sku.getHbSkuId());
 //                productRequest.setUpcCode(orderItem.getSkuId());
                 productRequest.setRefundCount(orderItem.getProdCount());
-                productRequest.setRefundMoney((long) (orderItem.getProductTotalAmount() * 100));
+                productRequest.setRefundMoney((long) (orderItem.getProductTotalAmount() == null ? 0 : orderItem.getProductTotalAmount() * 100));
                 productRequest.setTransId(sku.getSkuId().toString());
                 productRequests.add(productRequest);
 
@@ -1037,7 +1037,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             List<OrderPaymentRequest> orderPaymentRequests = new ArrayList<>();
             OrderPaymentRequest orderPaymentRequest = new OrderPaymentRequest();
             orderPaymentRequest.setPaymentType(1002);
-            orderPaymentRequest.setPaymentAmount((long) (orderRefund.getRefundAmount() * 100));
+            orderPaymentRequest.setPaymentAmount((long) (orderRefund.getRefundAmount() == null ? 0 : orderRefund.getRefundAmount() * 100));
             orderPaymentRequest.setPaymentNum(1);
             orderPaymentRequests.add(orderPaymentRequest);
             thirdPartyRefundRequest.setOrderPayments(orderPaymentRequests);