[add] 配送

yiqi-admin/src/main/java/com/yiqi/admin/controller/order/OrderClothController.java

@@ -296,13 +296,15 @@ public class OrderClothController extends BaseController {
             }
             case WAITING_TO_SEND: {
                 // 待送衣-送衣发单
-                OrderDelivery orderDelivery = orderDeliveryService
-                        .getOne(new QueryWrapper<OrderDelivery>().lambda()
-                                .eq(OrderDelivery::getOrderSn, orderNo)
-                                .eq(OrderDelivery::getClothOrderType, ClothOrderDeliveryType.takeCloth.getCode()));
-                if (orderDelivery == null) {
-                    throw new ServiceException("未查询到配送信息");
-                }
+                // 1.获取收衣配送单
+                OrderDelivery takeDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), ClothOrderDeliveryType.collectCloth.getCode());
+                OrderDelivery orderDelivery = new OrderDelivery(takeDelivery);
+                orderDelivery.setDeliverySn(orderNoUtils.getDeliveryOrderNo());
+                orderDelivery.setOrderSn(orderCloth.getOrderNo());
+                orderDelivery.setClothOrderType(ClothOrderDeliveryType.takeCloth.getCode());
+                orderDelivery.setCreateTime(DateUtils.getNowDate());
+                orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.WAIT_DELIVERY.getCode());
+                orderDelivery.setStoreId(orderCloth.getOrgId());
                 // 设置未同城配送订单
                 orderDelivery.setDeliveryWay(ClothOrderDeliveryWay.intracityExpress.getCode());
 
@@ -324,7 +326,7 @@ public class OrderClothController extends BaseController {
                 orderDelivery.setFetchCode(result.getFetch_code());
                 orderDelivery.setServiceTransId(result.getService_trans_id());
                 orderDelivery.setTransOrderId(result.getTrans_order_id());
-                orderDeliveryService.updateById(orderDelivery);
+                orderDeliveryService.save(orderDelivery);
 
                 if (result.getErrcode() != 0) {
                     throw new ServiceException("errorCode:" + result.getErrcode() + ";errorMsg:" + result.getErrmsg());
@@ -369,10 +371,11 @@ public class OrderClothController extends BaseController {
         }
         orderCloth.setSendClothAppUserId(deliveryManId);
         orderCloth.setSendClothWay(ClothOrderDeliveryWay.delivery.getCode());
+        orderCloth.setOrderStatus(ClothOrderStatusType.SENDING.getCode());
         orderClothService.updateById(orderCloth);
         // 创建配送单信息
         // 1.获取收衣配送单
-        OrderDelivery takeDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), ClothOrderDeliveryType.collectCloth.getCode());
+        OrderDelivery takeDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), ClothOrderDeliveryType.collectCloth.getCode());
         OrderDelivery orderDelivery = new OrderDelivery(takeDelivery);
         orderDelivery.setDeliverySn(orderNoUtils.getDeliveryOrderNo());
         orderDelivery.setOrderSn(orderCloth.getOrderNo());
@@ -381,6 +384,7 @@ public class OrderClothController extends BaseController {
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.WAIT_DELIVERY.getCode());
         orderDelivery.setDeliveryWay(ClothOrderDeliveryWay.delivery.getCode());
         orderDelivery.setStoreId(orderCloth.getOrgId());
+        orderDelivery.setDeliveryManId(deliveryManId);
         orderDeliveryService.save(orderDelivery);
 
         return R.ok();
@@ -847,7 +851,7 @@ public class OrderClothController extends BaseController {
         orderCloth.setTakeClothAppUserId(Long.parseLong(deliveryId));
         orderCloth.setOrderStatus(ClothOrderStatusType.WAITING_TO_DOOR.getCode());
         // 更新配送员id
-        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), "0");
+        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), "0");
         orderDelivery.setDeliveryManId(Long.valueOf(deliveryId));
         orderDeliveryService.updateById(orderDelivery);
         return success(orderClothService.updateById(orderCloth));

yiqi-api/src/main/java/com/yiqi/api/controller/order/WeAppOrderClothDeliveryManController.java

@@ -164,7 +164,7 @@ public class WeAppOrderClothDeliveryManController {
                 .set(OrderCloth::getOrderStatus, ClothOrderStatusType.HAS_TO_DOOR.getCode())
                 .eq(OrderCloth::getId, appOrderClothDeliveryChangeStatusDTO.getOrderId()));
         //更新配送订单
-        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), "1");
+        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), "1");
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.HAS_TO_DOOR.getCode());
         orderDelivery.setFetchTime(DateUtils.getNowDate());
         orderDeliveryService.updateById(orderDelivery);
@@ -192,7 +192,7 @@ public class WeAppOrderClothDeliveryManController {
                 .eq(OrderCloth::getId, appOrderClothDeliveryChangeStatusDTO.getOrderId()));
 
         //更新配送订单
-        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), "1");
+        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), "1");
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.SEND_FINISH.getCode());
         orderDelivery.setFinishTime(DateUtils.getNowDate());
         orderDeliveryService.updateById(orderDelivery);
@@ -221,7 +221,7 @@ public class WeAppOrderClothDeliveryManController {
                 .eq(OrderCloth::getId, appOrderClothDeliveryChangeStatusDTO.getOrderId()));
 
         //更新配送订单
-        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), "2");
+        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), "2");
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.SENDING.getCode());
         orderDelivery.setFetchTime(DateUtils.getNowDate());
         orderDeliveryService.updateById(orderDelivery);
@@ -250,7 +250,7 @@ public class WeAppOrderClothDeliveryManController {
                 .eq(OrderCloth::getId, appOrderClothDeliveryChangeStatusDTO.getOrderId()));
 
         //更新配送订单
-        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getId(), "2");
+        OrderDelivery orderDelivery = orderDeliveryService.selectOrderDeliveryByOrderId(orderCloth.getOrderNo(), "2");
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.SEND_FINISH.getCode());
         orderDelivery.setFinishTime(DateUtils.getNowDate());
         orderDeliveryService.updateById(orderDelivery);

yiqi-common/src/main/java/com/yiqi/common/utils/wx/WxAppApiRSASecretDTO.java

@@ -26,8 +26,8 @@ public class WxAppApiRSASecretDTO {
         WxAppApiRSASecretDTO wxAppApiAESSecretDTO = new WxAppApiRSASecretDTO();
         wxAppApiAESSecretDTO.setUrlPath(urlPath);
         wxAppApiAESSecretDTO.setAppId(wxMaProperties.getAppid());
-        wxAppApiAESSecretDTO.setSn(wxMaProperties.getApiRsaSn());
-        wxAppApiAESSecretDTO.setPrivateKey(wxMaProperties.getApiRsaKey());
+        wxAppApiAESSecretDTO.setSn(null);
+        wxAppApiAESSecretDTO.setPrivateKey(null);
         return wxAppApiAESSecretDTO;
     }
 }

yiqi-common/src/main/java/com/yiqi/order/service/IOrderDeliveryService.java

@@ -17,10 +17,10 @@ public interface IOrderDeliveryService extends IService<OrderDelivery> {
 
     /**
      * 查询订单配送
-     * @param orderId
+     * @param orderSn
      * @return
      */
-    OrderDelivery selectOrderDeliveryByOrderId(Long orderId, String clothOrderType);
+    OrderDelivery selectOrderDeliveryByOrderId(String orderSn, String clothOrderType);
 
     /**
      * 查询订单配送列表

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -1095,14 +1095,17 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             case 7:
                 // 待送衣
                 orderStatus = new Integer[]{9};
+                orderAppointmentDTO2.setTakeClothWay("1");
                 break;
             case 8:
                 // 送衣中
                 orderStatus = new Integer[]{10};
+                orderAppointmentDTO2.setSendClothWay("1");
                 break;
             case 99:
                 // 已完成
                 orderStatus = new Integer[]{11, 12};
+                orderAppointmentDTO2.setSendClothWay("1");
                 break;
             case 100:
                 orderStatus = new Integer[]{100};

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderDeliveryServiceImpl.java

@@ -24,9 +24,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 public class OrderDeliveryServiceImpl extends ServiceImpl<OrderDeliveryMapper, OrderDelivery> implements IOrderDeliveryService {
 
     @Override
-    public OrderDelivery selectOrderDeliveryByOrderId(Long orderId, String clothOrderType) {
+    public OrderDelivery selectOrderDeliveryByOrderId(String orderSn, String clothOrderType) {
         QueryWrapper<OrderDelivery> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("order_id", orderId);
+        queryWrapper.eq("order_sn", orderSn);
         queryWrapper.eq("cloth_order_type", clothOrderType);
         return baseMapper.selectOne(queryWrapper);
     }