Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/resources/application-dev.yml

@@ -18,4 +18,10 @@ spring:
       config: classpath:redisson/redisson-dev.yml
 
 logging:
-  config: classpath:logback/logback-dev.xml
+  config: classpath:logback/logback-dev.xml
+
+
+hb:
+  host: https://p-open.hiboos.com
+  appId: 5347a7077e65428bb9a87510ca7e1ea1
+  secret: 67899367b17e4a8d8a7d10ebe8449b90

yami-shop-api/src/main/resources/application-prod.yml

@@ -18,3 +18,10 @@ spring:
       config: classpath:redisson/redisson-prod.yml
 logging:
   config: classpath:logback/logback-prod.xml
+
+
+hb:
+  host: https://api-open.hiboos.com
+  appId: a4ab0376fde34b81a99335ff91adddf7
+  secret: ba167357df0a4e8dad4e3b62a2b54064
+

yami-shop-api/src/main/resources/application.yml

@@ -86,3 +86,4 @@ services:
   notifyUrl: http://he56cd66.natappfree.cc/notice/pay/order/wxNotify
   #退款回调
   refundNotifyUrl: http://he56cd66.natappfree.cc/notice/pay/order/refundNotify
+

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/HBOrderRefundController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @AllArgsConstructor
-@RequestMapping("/platform/orderRefund")
+@RequestMapping("/hb/platform")
 public class HBOrderRefundController {
 
     private final OrderRefundService orderRefundService;

yami-shop-platform/src/main/resources/application-dev.yml

@@ -19,3 +19,8 @@ spring:
 logging:
   config: classpath:logback/logback-dev.xml
 
+hb:
+  host: https://p-open.hiboos.com
+  appId: 5347a7077e65428bb9a87510ca7e1ea1
+  secret: 67899367b17e4a8d8a7d10ebe8449b90
+

yami-shop-platform/src/main/resources/application-prod.yml

@@ -19,3 +19,8 @@ spring:
 logging:
   config: classpath:logback/logback-prod.xml
 
+hb:
+  host: https://api-open.hiboos.com
+  appId: a4ab0376fde34b81a99335ff91adddf7
+  secret: ba167357df0a4e8dad4e3b62a2b54064
+

yami-shop-platform/src/main/resources/application.yml

@@ -38,12 +38,6 @@ application:
   workerId: 1
 
 
-hb:
-  host: https://p-open.hiboos.com
-  appId: 5347a7077e65428bb9a87510ca7e1ea1
-  secret: 67899367b17e4a8d8a7d10ebe8449b90
-
-
 #服务商
 services:
   #服务商AppId

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

@@ -232,7 +232,6 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
         }
 
         int successCount = 0;
-
         for (int i = 0; i < importData.size(); i++) {
             ChannelProdImportVO importVO = importData.get(i);
             try {

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

@@ -435,7 +435,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
         }
 
-
         // 店铺真正退款的金额是不用退分销员的那部分的
         // 如果订单100元，分销10元，10元的分销费用由商家出，此时商家结算时，拿到90元。
         // 当用户进行退款，退1块的时候，分销会无效，此时商家拿回给出去的10元分销费用，并将1元给到退款用户，此时商家因为退款赚9元。 shopRealRefundAmount = -9
@@ -570,7 +569,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         Order order = orderService.getOrderByOrderNumber(orderRefundDto.getOrderNumber());
         int oldOrderStatus = order.getHbOrderStatus();
 
-
         // 退款成功（保存退款结算记录、更新订单、还原库存）
         refundSuccess(order, orderRefundDto);
 
@@ -585,8 +583,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 && Objects.equals(order.getCloseType(), OrderCloseType.REFUND.value())) {
             applicationContext.publishEvent(new ReceiptOrderEvent(order));
         }
-
-
     }
 
     /**
@@ -809,14 +805,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             throw new GlobalException("当前订单正在等待成团状态，需等待成团才能进行下一步操作");
         }
 
-//        if (!Objects.equals(orderRefundParam.getRefundType(),RefundType.ALL.value()) && Objects.equals(order.getStatus(),OrderStatus.PADYED.value())) {
-//            throw new GlobalException("未发货订单仅支持整单退款");
-//        }
-//        // 代发货整单退款不可以输入金额，为固定全额退款
-//        if (Objects.equals(orderRefundParam.getRefundType(),RefundType.ALL.value()) && Objects.equals(order.getStatus(),OrderStatus.PADYED.value())) {
-//            orderRefundParam.setRefundAmount(order.getActualTotal());
-//        }
-
         if (orderRefundParam.getRefundAmount() > order.getActualTotal()) {
             throw new GlobalException("退款金额已超出订单金额，无法申请");
         }
@@ -836,7 +824,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             throw new GlobalException("66该订单已有商品正在退款中，不能再进行整单退款");
         }
 
-
         // 生成退款单信息
         OrderRefund newOrderRefund = new OrderRefund();
 
@@ -980,9 +967,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         HBBaseReq<Object> build = HBBaseReq.create();
         build.setAppId(hbSignUtil.getAppId());
         OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
-//        orderRefund.setReturnMoneySts(refundStatus);
-//        orderRefundMapper.updateById(orderRefund);
-
         // 3. 构建外层请求体
         JSONObject requestBody = new JSONObject();
         requestBody.put("afterSaleOrder", afterSaleOrder);
@@ -1024,7 +1008,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
             thirdPartyRefundRequest.setReason(orderRefund.getBuyerReason());
             thirdPartyRefundRequest.setProblemDescription(orderRefund.getBuyerDesc());
-//            thirdPartyRefundRequest.setPictures(orderRefund.getPhotoFiles());
 
             thirdPartyRefundRequest.setRefundStatus(orderRefund.getReturnMoneySts());
             Integer applyType = orderRefund.getApplyType();
@@ -1042,7 +1025,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             thirdPartyRefundRequest.setTimestamp(orderRefund.getApplyTime().getTime());
             thirdPartyRefundRequest.setRefundSource(1);
 
-
             List<ProductRequest> productRequests = new ArrayList<>();
             orderRefundSkuMapper.selectList(new LambdaQueryWrapper<OrderRefundSku>().eq(OrderRefundSku::getOrderRefundId, orderRefund.getRefundId())).forEach(orderRefundSku -> {
                 Sku sku = skuService.getById(orderRefundSku.getSkuId());
@@ -1050,7 +1032,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 productRequest.setSkuName(sku.getSkuName());
                 productRequest.setSkuId(orderRefundSku.getSkuId());
                 productRequest.setChannelSkuId(sku.getHbSkuId());
-//                productRequest.setUpcCode(orderItem.getSkuId());
                 productRequest.setRefundCount(orderRefundSku.getProductCount());
                 productRequest.setRefundMoney((long) (orderRefundSku.getSkuPrice() == null ? 0 : orderRefundSku.getProductCount() * orderRefundSku.getSkuPrice() * 100));
                 productRequest.setTransId(sku.getSkuId().toString());
@@ -1067,13 +1048,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             orderPaymentRequests.add(orderPaymentRequest);
             thirdPartyRefundRequest.setOrderPayments(orderPaymentRequests);
             log.info("退款订单信息，参数：{}", thirdPartyRefundRequest);
-
-
-//            orderRefund.setReturnMoneySts(orderRefund.getReturnMoneySts());
-//            orderRefundMapper.updateById(orderRefund);
-
-//            changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
-
             // 返回退款单信息
             log.info("退款订单状态：{}", orderRefund.getReturnMoneySts());
             //TODO 退款单完成处理积分
@@ -1108,7 +1082,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
 
             OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
-
             if (auditType == 3) {
                 //3：驳回
                 String reason = bodyStr.getString("reason");
@@ -1142,17 +1115,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 orderRefundRecord1.setAuditStatus(3);
                 orderRefundRecord1.setSort(3);
                 orderRefundRecordMapper.insert(orderRefundRecord1);
-
-//                orderService.returnRefund(orderRefund.getOrderNumber());
             }
-
-
-
-
             //推送商家审核状态后 同步退款单状态
             changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
-
-
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
             HBR.error("未知异常");
@@ -1171,7 +1136,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             Integer auditType = bodyStr.getInteger("auditType");
 
             OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
-
             if (auditType == 2 || auditType == 4) {
                 orderRefund.setIsReceiver(true);
                 orderRefund.setReturnMoneySts(ReturnMoneyStsType.PROCESSING.value());
@@ -1179,10 +1143,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 orderRefund.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
                 orderRefund.setRejectMessage(bodyStr.getString("reason"));
             }
-
             orderRefundMapper.updateById(orderRefund);
 
-
             //3：驳回
             if (auditType == 3) {
                 Order orderByOrderNumber = orderService.getOrderByOrderNumber(channelOrderId);
@@ -1203,13 +1165,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             JSONObject bodyStr = hBRequest.getJSONObject("body");
             log.info("部分退款接口-回调接口，body：{}", bodyStr);
             String channelOrderId = bodyStr.getString("channelOrderId");
-//            Integer auditType = bodyStr.getInteger("auditType");
             Integer applyDeal = bodyStr.getInteger("applyDeal");
 
-
             OrderRefundParam orderRefundParam = new OrderRefundParam();
             Order order = orderMapper.getOrderAndOrderItemByOrderNumber(channelOrderId);
-
             orderRefundParam.setOrderNumber(channelOrderId);
             orderRefundParam.setRefundType(RefundType.SINGLE.value());
             orderRefundParam.setApplyType(1);
@@ -1228,19 +1187,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                     orderRefund.setApplyType(5);
                 }
             }
-
-//            if (auditType == 2 || auditType == 4) {
-//                orderRefund.setIsReceiver(true);
-//                orderRefund.setReturnMoneySts(ReturnMoneyStsType.PROCESSING.value());
-//            } else {
-//                orderRefund.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
-//                orderRefund.setRejectMessage(bodyStr.getString("reason"));
-//            }
-
             JSONArray products = bodyStr.getJSONArray("products");
             log.info("部分退款接口-回调接口，products：{}", products);
 
-
             List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
             int goodsNum = 0;
             for (Object product : products) {
@@ -1263,12 +1212,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             orderRefund.setGoodsNum(goodsNum);
             orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
 
-
             OrderRefund orderRefund1 = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
-
             //推送海博创建订单
             createRefundOrder(order.getOrderNumber(), orderRefund1.getRefundSn());
-
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
             HBR.error("未知异常");