换物发货

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -160,7 +160,7 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
             orderUpdateDto.setDeliveryTime(now);
             orderUpdateDto.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode());
             distributionOrderDao.update(orderUpdateDto);
-            //发货成功，发送模板信息通知分销商和用户
+           /* //发货成功，发送模板信息通知分销商和用户
             try {
                 DeliveryNoticeMsg deliveryNoticeMsg = new DeliveryNoticeMsg();
                 deliveryNoticeMsg.setDistributionOrderId(distributionOrderId);
@@ -195,7 +195,7 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 }
             } catch (Exception e) {
                 logger.info("分销订单发货通知模板信息发送失败:{}", e);
-            }
+            }*/
             return Result.success();
         } catch (Exception e) {
             logger.info("发货失败 error: {}", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -1089,11 +1089,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     userExchangeInfo.setFromWaybill(exchangeOrderSnapshotList.get(0).getWaybill());
                     userExchangeInfo.setFromLogisticsCode(exchangeOrderSnapshotList.get(0).getLogisticsCode());
                     userExchangeInfo.setFromLogisticsName(LogisticsEnum.getNameByCode(exchangeOrderSnapshotList.get(0).getLogisticsCode()));
-                    String content;
+                    String content = "";
                     if (StringUtils.hasLength(exchangeOrderSnapshotList.get(0).getWaybill())) {
                         content = "商品已寄出，快递信息:" + LogisticsEnum.getNameByCode(exchangeOrderSnapshotList.get(0).getLogisticsCode()) + "," + exchangeOrderSnapshotList.get(0).getWaybill();
-                    } else {
-                        content = "商品未寄出";
                     }
                     userExchangeInfo.setContent(content);
                 }