商家认证接口优化

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

@@ -49,8 +49,12 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
             param.setStoreAddress(param.getRegion());
         }
         MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
-        Integer count = this.lambdaQuery().eq(MerchantAuth::getApplicant, userId).count();
-        AssertUtils.available(count <= 0, "商家认证已存在");
+        MerchantAuth count = this.lambdaQuery().eq(MerchantAuth::getApplicant, userId).one();
+        //AssertUtils.available(count <= 0, "商家认证已存在");
+        if (null != count){
+            this.updateMerchantAuth(count.getId(),param);
+            return count.getId();
+        }
         merchantAuth.setApplicationTime(new Date());
         merchantAuth.setApplicant(userId);
         merchantAuth.setReviewStatus("2");
@@ -91,6 +95,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
         merchantAuth.setReviewStatus("2");
+        merchantAuth.setId(id);
         this.updateById(merchantAuth);
         MerchantModifyParam param1 = new MerchantModifyParam();
         param1.setName(param.getStoreName());

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -930,7 +930,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             oms_order
         WHERE
-            STATUS = '3'
+            STATUS = '4'
             and merchant_id = #{merchantId}
           AND DATE_FORMAT( payment_time, '%Y%m%d' ) = DATE_FORMAT(
                 now(),

vehicle-server/src/main/resources/mapper/ReservationMapper.xml

@@ -82,7 +82,7 @@
         <if test="param.status != null">
             and re.status = #{param.status}
         </if>
-        <if test="param.date != null">
+        <if test="param.date != null and param.date != ''">
             and  DATE_FORMAT(re.appoint_time, '%Y-%m-%d') = #{param.date}
         </if>
         order by re.appoint_time asc