Przeglądaj źródła

Merge branch 'master' of zyh/kmall-haikong into master

张永豪 3 lat temu
rodzic
commit
cab64ade93

+ 4 - 2
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2840,7 +2840,7 @@ public class OrderServiceImpl implements OrderService {
             LOGGER.info("----------------------------------------------------------------------------");
             return resultObj;
         } catch (Exception e) {
-            LOGGER.error("下单出现异常:" + e);
+            LOGGER.error("下单出现异常:",e);
             resultObj.put("errno", 400);
             resultObj.put("errmsg", "订单异常------" + e.getMessage());
             throw new RuntimeException(e);
@@ -3367,7 +3367,7 @@ public class OrderServiceImpl implements OrderService {
         haiKongMemberOrderSyncResendEntity.setCreateTime(date);
         haiKongMemberOrderSyncResendEntity.setLastResendTime(date);
         haiKongMemberOrderSyncResendEntity.setPhone(memberPhone);
-        haiKongMemberOrderSyncResendEntity.setOrderId(order.getId());
+        haiKongMemberOrderSyncResendEntity.setOrderId(order.getId().toString());
         try {
             String body = JacksonUtil.toJson(memberOrderInfoSyncDTO);
             LOGGER.info("请求会员系统同步消费订单接口!请求体:{}", body);
@@ -3747,6 +3747,8 @@ public class OrderServiceImpl implements OrderService {
         //调用会员系统积分全量回退接口
         vipIntegralGoBack(order);
 
+        //调用会员退货单推送-整单退货接口
+
     }
 
     /**