Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopRentInfoDAO.java

@@ -1,5 +1,6 @@
 package com.cool.store.dao;
 
+import com.cool.store.constants.CommonConstants;
 import com.cool.store.entity.ShopRentInfoDO;
 import com.cool.store.mapper.ShopRentInfoMapper;
 import com.cool.store.vo.point.ShopRentInfoVO;
@@ -31,4 +32,11 @@ public class ShopRentInfoDAO {
         }
         return shopRentInfoMapper.getRentContractByShopId(shopId);
     }
+
+    public Integer updateRentContract(ShopRentInfoDO shopRentInfo) {
+        if(Objects.isNull(shopRentInfo.getId())){
+            return CommonConstants.ZERO;
+        }
+        return shopRentInfoMapper.updateByPrimaryKeySelective(shopRentInfo);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -86,28 +86,28 @@ public class ShopStageInfoDAO {
         return shopStageInfoMapper.getShopSubStageInfo(shopId, shopSubStageEnum.getShopSubStage());
     }
 
-    /**
-     * 更新店铺阶段状态
-     * @param shopId
-     * @param shopStageInfo
-     * @return
-     */
-    public Integer updateShopStageInfo(Long shopId, ShopSubStageStatusEnum shopStageInfo, Long auditId) {
-        if(Objects.isNull(shopId) || Objects.isNull(shopStageInfo)){
-            return CommonConstants.ZERO;
-        }
-        String remark = shopStageInfo.getShopSubStageName() + CommonConstants.PATH_BAR +shopStageInfo.getShopSubStageStatusName();
-        boolean isTerminated = shopStageInfo.isTerminated();
-        return shopStageInfoMapper.updateShopStageInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId);
-    }
-
     public Integer updateShopStageInfo(Long shopId, ShopSubStageStatusEnum shopStageInfo) {
         if(Objects.isNull(shopId) || Objects.isNull(shopStageInfo)){
             return CommonConstants.ZERO;
         }
         String remark = shopStageInfo.getShopSubStageName() + CommonConstants.PATH_BAR +shopStageInfo.getShopSubStageStatusName();
         boolean isTerminated = shopStageInfo.isTerminated();
-        return shopStageInfoMapper.updateShopStageInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, null);
+        return shopStageInfoMapper.updateShopStageInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark);
+    }
+
+    /**
+     * 更新店铺阶段状态及审核信息
+     * @param shopId
+     * @param shopStageInfo
+     * @return
+     */
+    public Integer updateShopStageAndAuditInfo(Long shopId, ShopSubStageStatusEnum shopStageInfo, Long auditId) {
+        if(Objects.isNull(shopId) || Objects.isNull(shopStageInfo)){
+            return CommonConstants.ZERO;
+        }
+        String remark = shopStageInfo.getShopSubStageName() + CommonConstants.PATH_BAR +shopStageInfo.getShopSubStageStatusName();
+        boolean isTerminated = shopStageInfo.isTerminated();
+        return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId);
     }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

@@ -33,6 +33,19 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
      * @return
      */
     Integer updateShopStageInfo(@Param("shopId") Long shopId, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus,
+                                @Param("isTerminated")boolean isTerminated, @Param("remark") String remark);
+
+    /**
+     * 更新阶段及审核信息
+     * @param shopId
+     * @param shopSubStage
+     * @param shopSubStageStatus
+     * @param isTerminated
+     * @param remark
+     * @param auditId
+     * @return
+     */
+    Integer updateShopStageAndAuditInfo(@Param("shopId") Long shopId, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus,
                                 @Param("isTerminated")boolean isTerminated, @Param("remark") String remark, @Param("auditId")Long auditId);
 
     /**

coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml

@@ -95,8 +95,8 @@
         #{item}
       </foreach>
     </if>
-    <if test="request.areaPath != null">
-      and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{request.areaPath}, '%'))
+    <if test="areaPath != null">
+      and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{areaPath}, '%'))
     </if>
   </select>
   

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -65,4 +65,17 @@
       shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} and deleted = 0
   </select>
 
+  <update id="updateShopStageAndAuditInfo">
+    update
+      xfsg_shop_stage_info
+    set
+      shop_sub_stage_status = #{shopSubStageStatus},
+      is_terminated = #{isTerminated},
+      remark = #{remark},
+      actual_complete_time = if(is_terminated, now(), null),
+      audit_id = #{auditId}
+    where
+      shop_id = #{shopId} and shop_sub_stage = #{shopSubStage}
+  </update>
+
 </mapper>