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

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

@@ -275,4 +275,8 @@ public class ShopStageInfoDAO {
 
         return shopStageInfoMapper.getSubStageListBySubStageStatus(a.getShopSubStageStatus(),b.getShopSubStageStatus(),c.getShopSubStageStatus());
     }
+
+    public ShopStageInfoDO getByShopIdAndSubStage(Long shopId, Integer shopSubStage) {
+        return shopStageInfoMapper.getByShopIdAndSubStage(shopId,shopSubStage);
+    }
 }

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

@@ -143,4 +143,13 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
      * @description:获取处于a阶段或b阶段，和c阶段的
      */
     List<ShopStageInfoDO> getSubStageListBySubStageStatus(@Param("subStageStatusA")Integer subStageStatusA,@Param("subStageStatusB")Integer subStageStatusB,@Param("subStageStatusC")Integer subStageStatusC );
+
+    /**
+     * 根据shopId和阶段查数据
+     * @param shopId
+     * @param shopSubStage
+     * @return
+     */
+    ShopStageInfoDO getByShopIdAndSubStage(@Param("shopId") Long shopId,
+                                           @Param("shopSubStage") Integer shopSubStage);
 }

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

@@ -295,4 +295,11 @@
       and shop_sub_stage_status = #{subStageStatusC}
     </if>
   </select>
+
+  <select id="getByShopIdAndSubStage" resultType="com.cool.store.entity.ShopStageInfoDO">
+    SELECT <include refid="allColumn"/>
+    FROM xfsg_shop_stage_info
+    WHERE shop_id = #{shopId}
+    AND shop_sub_stage = #{shopSubStage}
+  </select>
 </mapper>