Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/vehicle

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/ReservationModifyParam.java

@@ -34,17 +34,6 @@ public class ReservationModifyParam implements Serializable {
      */
     @NotNull(message = "约定时间不能为空")
     private Date appointTime;
-    /**
-     * 商品id
-     */
-    @NotNull(message = "商家ID不能为空")
-    private Long goodsId;
-
-    /**
-     * 商品名称
-     */
-    @Size(max = 255, message = "商品名称长度不能大于255")
-    private String goodsName;
 
     /**
      * 订单ID

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -402,13 +402,14 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         Integer status = param.getStatus();
         Page<OmsOrder> page = this.lambdaQuery()
                 .eq(OmsOrder::getUserId, userId)
-                .eq(OmsOrder::getStatus, status)
+                .eq(StringUtils.notEmpty(status),OmsOrder::getStatus, status)
                 .orderByDesc(OmsOrder::getCreateTime)
                 .page(DatabaseContextHolder.page(param.getPaging()));
         Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
         pagination.getRecords().forEach(item -> {
+            item.setMerchantInfo(this.merchantService.getMerchantById(item.getMerchantId()));
             List<OmsOrderItemDTO> goodsInfos = this.omsOrderItemService.getOrderItemByOrderId(item.getId());
-            if(status == 4){
+            if(StringUtils.notEmpty(status) && status == 4){
                 if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(goodsInfos)){
                     goodsInfos.forEach(e ->
                             e.setAssessStatus(assessService.queryAssessStatus(e.getOrderId(), e.getGoodsId(), userId))