Merge remote-tracking branch 'origin/master'

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

@@ -189,8 +189,10 @@ public class WeAppOrderClothController {
         orderClothService.save(orderCloth);
         // 预创建配送单
         OrderDelivery orderDelivery = new OrderDelivery(appUserAddress);
+        orderDelivery.buildCreateData();
         orderDelivery.setDeliverySn(orderNoUtils.getDeliveryOrderNo());
         orderDelivery.setOrderSn(orderCloth.getOrderNo());
+        orderDelivery.setStoreId(orderCloth.getOrgId());
         orderDelivery.setClothOrderType(ClothOrderDeliveryType.collectCloth.getCode());
         orderDelivery.setCreateTime(DateUtils.getNowDate());
         orderDelivery.setDeliveryStatus(OrderDeliveryStatusEnum.WAIT_DELIVERY.getCode());

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

@@ -75,7 +75,9 @@ public class WeAppOrderClothDeliveryManController {
 
         LambdaQueryWrapper<OrderDelivery> queryWrapper = new LambdaQueryWrapper<OrderDelivery>();
         queryWrapper.eq(OrderDelivery::getDeliveryManId, AuthHolder.userId());
-        queryWrapper.eq(OrderDelivery::getDeliveryStatus, appOrderClothDeliveryManQueryDTO.getDeliveryStatus());
+        if(appOrderClothDeliveryManQueryDTO.getDeliveryStatus()!=null){
+            queryWrapper.eq(OrderDelivery::getDeliveryStatus, appOrderClothDeliveryManQueryDTO.getDeliveryStatus());
+        }
         queryWrapper.orderByDesc(BaseEntity::getCreateTime);
         List<OrderDelivery> orderDeliveryList = orderDeliveryService.page(page
                 , queryWrapper).getRecords();
@@ -92,7 +94,12 @@ public class WeAppOrderClothDeliveryManController {
                 orderDeliveryVO.setStoreName(store.getName());
                 StoreAddressVO storeAddressVO = new StoreAddressVO();
                 BeanUtils.copyProperties(store, storeAddressVO);
+                orderDeliveryVO.setStoreAddress(storeAddressVO);
             }
+            OrderCloth orderCloth = orderClothService.getOrderClothByOrderNo(orderDelivery.getOrderSn());
+            OrderClothVO orderClothVO = new OrderClothVO();
+            BeanUtils.copyProperties(orderCloth, orderClothVO);
+            orderDeliveryVO.setOrderCloth(orderClothVO);
             orderDeliveryVOList.add(orderDeliveryVO);
         }
         return R.ok(orderDeliveryVOList);

yiqi-api/src/main/resources/application.yml

@@ -64,6 +64,13 @@ spring:
     #    active: @profileActive@
     active: dev
   # jackson时间格式化
+  jackson:
+    default-property-inclusion: NON_NULL
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      WRITE_NULL_MAP_VALUES: false
+      INDENT_OUTPUT: true
   # 资源信息
   messages:
     # 国际化资源文件路径

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppOrderClothDeliveryManQueryDTO.java

@@ -11,6 +11,15 @@ import lombok.Data;
 @Data
 public class AppOrderClothDeliveryManQueryDTO extends PageVO {
 
-    @ApiModelProperty("配送状态（1=待上门,2=已上门,8=配送中,9=已完成, 100=已取消）")
+    /**
+     *     WAIT_DELIVERY("0", "待派单"),
+     *     CREATE_ORDER_SUCCESS("1", "已派单"),
+     *     RECEIVE_ORDER("2", "已接单"),
+     *     HAS_TO_DOOR("3", "已上门"),
+     *     SENDING("4", "配送中"),
+     *     SEND_FINISH("9", "配送完成"),
+     */
+
+    @ApiModelProperty("配送状态（2=待上门,3=已上门,4=配送中,9=已完成, 100=已取消）")
     private String deliveryStatus;
 }

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderDeliveryVO.java

@@ -175,4 +175,7 @@ public class OrderDeliveryVO implements Serializable {
      */
     private StoreAddressVO storeAddress;
 
+
+    private OrderClothVO orderCloth;
+
 }