换货审批单2

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

@@ -137,6 +137,8 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
     @Transactional
     @Override
     public Result handleApplyOrder(ExchangeApplyOrderRequestDto dto) {
+        String url = "";
+        String msg = "";
         try {
             String orderId = dto.getExchangeApplyOrderId();
             ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByOrderId(orderId);
@@ -210,12 +212,25 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
                 updateExchangeApplyOrder.setState(ExchangeApplyOrderEnum.StateEnum.AGREE.getCode());
                 exchangeApplyOrderDao.update(updateExchangeApplyOrder);
                 logger.info("************* 交换达成, 交换单号:{}, 申请人的订单号:{}， 受理人的订单号;{} *************", orderId, userOrderId, targetUserOrderId);
+
+                url = wxAppletApi.getUrlLink("/pages/saleExchangeApplyOrderDetail/index?orderId=" + orderId,null);
+                msg = "您申请的换货申请单已同意，" + "请前往"+ url + "查看";
             } else {
                 //接收方拒绝交换
                 //取消申请单，把订单明细设置为无效
                 exchangeApplyOrderDao.updateState(orderId, ExchangeApplyOrderEnum.StateEnum.DISAGREE.getCode());
                 exchangeApplyOrderDetailDao.updateInValid(orderId);
+                url = wxAppletApi.getUrlLink("/pages/saleExchangeApplyOrderDetail/index?orderId=" + orderId,null);
+                msg = "您申请的换货申请单被拒绝，" + "请前往"+ url + "查看";
+            }
+
+            //发短信通知申请方
+            try {
+                aliSmsSender.sendSms(dto.getTargetUserId(), msg);
+            } catch (Exception e) {
+                logger.info(">>>>>>>>> 用户id:{}, 发送换货申请结果通知短信失败 <<<<<<<<<", dto.getTargetUserId());
             }
+
             return Result.success();
         } catch (Exception e) {
             logger.error("处理换物申请单 error:{}", e);
@@ -367,6 +382,7 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
             for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : detailList) {
                 SupplierItem supplierItem = supplierItemDao.findById(exchangeApplyOrderDetail.getItemId());
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
+                EntityMapper.copyAttribute(supplierItem, supplierItemVo);
                 supplierItemVo.setItemId(exchangeApplyOrderDetail.getItemId());
                 supplierItemVo.setName(supplierItem.getName());
                 supplierItemVo.setItemNum(exchangeApplyOrderDetail.getItemNum());
@@ -455,10 +471,8 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
      * @param exchangeApplyOrderId
      */
     private void checkHandleTimeOutByOrderId(String exchangeApplyOrderId){
-        ExchangeApplyOrderRequestDto queryDto = new ExchangeApplyOrderRequestDto();
-        queryDto.setExchangeApplyOrderId(exchangeApplyOrderId);
         ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByExchangeOrderId(exchangeApplyOrderId);
-        if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.PRE_HANDLE.getCode()) {
+        if (exchangeApplyOrder != null && exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.PRE_HANDLE.getCode()) {
             long diffInMillies = Math.abs(new Date().getTime() - exchangeApplyOrder.getCreateTime().getTime());
             //超出48小时未处理审批单，订单取消
             long diffInHours = diffInMillies / (60 * 1000 * 60);

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

@@ -171,6 +171,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
 
             ExchangeOrderDetailVo exchangeOrderDetailVo = new ExchangeOrderDetailVo();
             EntityMapper.copyAttribute(distributionOrder, exchangeOrderDetailVo);
+            exchangeOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
             exchangeOrderDetailVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
             //查询订单中交换得到的商品
             List<DistributionOrderDetail> distributionOrderDetailList = distributionOrderDetailDao.findByOrderId(distributionOrder.getDistributionOrderId());