smqjh订单推送海博收货信息模块

yami-shop-service/src/main/java/com/yami/shop/config/SMConstants.java

@@ -8,7 +8,7 @@ package com.yami.shop.config;
  */
 public class SMConstants {
 
-    public static final String SM_BASE_URL = "http://47.109.84.152:8081/smqjh-oms";
+    public static final String SM_BASE_URL = "http://47.109.39.185:8081/smqjh-oms";
 //    public static final String SM_BASE_URL = "http://192.168.0.157:8080/smqjh-oms";
 
 }

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

@@ -188,7 +188,7 @@ public class HBOrderService implements IHBOrderService {
         orderMapper.updateById(order);
 
         //取消订单
-        if (operatorType == 60) {
+        if (operatorType == 60 && !order.getOrderType().equals(4)) {
             log.info("取消订单{}", channelOrderId);
             changeOrderStatus(channelOrderId, 60);
             //创建退款单
@@ -264,8 +264,6 @@ public class HBOrderService implements IHBOrderService {
             }
             OrderRefund orderRefund = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
             orderRefundService.createRefundOrder(order.getOrderNumber(), orderRefund.getRefundSn());
-
-
         }
         //成功直接通知海博
         if (order.getHbOrderStatus() == 80) {