处理意见反馈

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/OrderPagingParam.java

@@ -32,4 +32,8 @@ public class OrderPagingParam implements Serializable {
      * 订单状态集合
      */
     private List<Integer> statuses;
+    /**
+     * 订单号
+     */
+    private String orderSn;
 }

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

@@ -35,8 +35,10 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     private final MerchantService merchantService;
     @Override
     public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param) {
-        MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
         Long userId = SessionContextHolder.getId();
+        MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
+        Integer count = this.lambdaQuery().eq(MerchantAuth::getApplicant, userId).count();
+        AssertUtils.available(count <= 0, "商家认证已存在");
         merchantAuth.setApplicationTime(new Date());
         merchantAuth.setApplicant(userId);
         this.save(merchantAuth);

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

@@ -390,6 +390,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         if (scope == Scope.ADMIN) {
             Page<OmsOrder> page = this.lambdaQuery()
                     .eq(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, param.getStatus())
+                    .eq(StringUtils.notEmpty(param.getOrderSn()),OmsOrder::getOrderSn,param.getOrderSn())
                     .orderByDesc(OmsOrder::getCreateTime)
                     .page(DatabaseContextHolder.page(param.getPaging()));
             Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
@@ -404,6 +405,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             }
             Page<OmsOrder> page = this.lambdaQuery()
                     .eq(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, param.getStatus())
+                    .eq(StringUtils.notEmpty(param.getOrderSn()),OmsOrder::getOrderSn,param.getOrderSn())
                     .in(OmsOrder::getMerchantId, merchants)
                     .orderByDesc(OmsOrder::getCreateTime)
                     .page(DatabaseContextHolder.page(param.getPaging()));