ソース修正

yamada-fcbi/src/main/java/jp/yamada/fcbi/domain/YmdfFcStore.java

@@ -19,7 +19,7 @@ public class YmdfFcStore extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 店舗ID */
-    private String storeId;
+    private String fcStoreId;
 
     /** 店舗コード */
     @Excel(name = "店舗コード")

yamada-fcbi/src/main/java/jp/yamada/fcbi/mapper/YmdfFcStoreMapper.java

@@ -16,10 +16,10 @@ public interface YmdfFcStoreMapper
     /**
      * 查询店舗（ブランドと地区と業種を関連付け）
      * 
-     * @param id 店舗（ブランドと地区と業種を関連付け）主键
+     * @param fcStoreId 店舗（ブランドと地区と業種を関連付け）主键
      * @return 店舗（ブランドと地区と業種を関連付け）
      */
-    YmdfFcStore selectYmdfFcStoreById(String id);
+    YmdfFcStore selectYmdfFcStoreById(String fcStoreId);
 
     /**
      * 查询店舗（ブランドと地区と業種を関連付け）列表
@@ -48,16 +48,16 @@ public interface YmdfFcStoreMapper
     /**
      * 删除店舗（ブランドと地区と業種を関連付け）
      * 
-     * @param id 店舗（ブランドと地区と業種を関連付け）主键
+     * @param fcStoreId 店舗（ブランドと地区と業種を関連付け）主键
      * @return 结果
      */
-    int deleteYmdfFcStoreById(String id);
+    int deleteYmdfFcStoreById(String fcStoreId);
 
     /**
      * 批量删除店舗（ブランドと地区と業種を関連付け）
      * 
-     * @param ids 需要删除的数据主键集合
+     * @param fcStoreIds 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteYmdfFcStoreByIds(String[] ids);
+    int deleteYmdfFcStoreByIds(String[] fcStoreIds);
 }

yamada-fcbi/src/main/java/jp/yamada/fcbi/service/impl/YmdfFcMemberServiceImpl.java

@@ -11,6 +11,7 @@ import jp.yamada.fcbi.domain.YmdfFcMember;
 import jp.yamada.fcbi.domain.YmdfFcMemberStore;
 import jp.yamada.fcbi.domain.YmdfFcStore;
 import jp.yamada.fcbi.enums.ApplyStatusEnum;
+import jp.yamada.fcbi.enums.ContractStatusEnum;
 import jp.yamada.fcbi.enums.PrimaryStoreFlagEnum;
 import jp.yamada.fcbi.mapper.YmdfFcApplicantMapper;
 import jp.yamada.fcbi.mapper.YmdfFcMemberMapper;
@@ -76,8 +77,8 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
             throw new ServiceException("会员与店铺关联关系创建失败");
         }
 
-        // 6. 更新申请状态为已创建会员
-        fcApplicant.setApplyStatus(ApplyStatusEnum.APPLYING.getCode());
+        // 6. 契約状態を署名完了に更新する
+        fcApplicant.setContractStatus(ContractStatusEnum.SIGNED.getCode());
         ymdfApplicantMapper.updateYmdfFcApplicant(fcApplicant);
     }
 
@@ -150,7 +151,7 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
      */
     private YmdfFcStore buildStore(YmdfFcApplicant applicant, String fcMemberId, String storeId) {
         YmdfFcStore fcStore = new YmdfFcStore();
-        fcStore.setStoreId(storeId);
+        fcStore.setFcStoreId(storeId);
         fcStore.setStoreCode(generateStoreCode(applicant.getApplyBrandCode()));
         fcStore.setStoreName(applicant.getFcApplicantName() + "店");
         // 希望ブランドコード

yamada-fcbi/src/main/resources/mapper/fcbi/YmdfFcStoreMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="jp.yamada.fcbi.mapper.YmdfFcStoreMapper">
     
     <resultMap type="YmdfFcStore" id="YmdfFcStoreResult">
-        <result property="storeId"    column="store_id"    />
+        <result property="fcStoreId"    column="fc_store_id"    />
         <result property="storeCode"    column="store_code"    />
         <result property="storeName"    column="store_name"    />
         <result property="brandCode"    column="brand_code"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectYmdfFcStoreVo">
-        select store_id, store_code, store_name, brand_code, business_type_code, region_code, store_address, store_phone, store_latitude, store_longitude, manager, store_status, del_flag, create_by, create_time, update_by, update_time, remark, version from ymdf_fc_store
+        select fc_store_id, store_code, store_name, brand_code, business_type_code, region_code, store_address, store_phone, store_latitude, store_longitude, manager, store_status, del_flag, create_by, create_time, update_by, update_time, remark, version from ymdf_fc_store
     </sql>
 
     <select id="selectYmdfFcStoreList" parameterType="YmdfFcStore" resultMap="YmdfFcStoreResult">
@@ -50,13 +50,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectYmdfFcStoreById" parameterType="String" resultMap="YmdfFcStoreResult">
         <include refid="selectYmdfFcStoreVo"/>
-        where id = #{id}
+        where fc_store_id = #{fcStoreId}
     </select>
 
     <insert id="insertYmdfFcStore" parameterType="YmdfFcStore">
         insert into ymdf_fc_store
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="storeId != null">store_id,</if>
+            <if test="fcStoreId != null">fc_store_id,</if>
             <if test="storeCode != null and storeCode != ''">store_code,</if>
             <if test="storeName != null and storeName != ''">store_name,</if>
             <if test="brandCode != null and brandCode != ''">brand_code,</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="storeId != null">#{storeId},</if>
+            <if test="fcStoreId != null">#{fcStoreId},</if>
             <if test="storeCode != null and storeCode != ''">#{storeCode},</if>
             <if test="storeName != null and storeName != ''">#{storeName},</if>
             <if test="brandCode != null and brandCode != ''">#{brandCode},</if>
@@ -125,13 +125,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteYmdfFcStoreById" parameterType="String">
-        delete from ymdf_fc_store where store_id = #{storeId}
+        delete from ymdf_fc_store where fc_store_id = #{fcStoreid}
     </delete>
 
     <delete id="deleteYmdfFcStoreByIds" parameterType="String">
-        delete from ymdf_fc_store where store_id in
+        delete from ymdf_fc_store where fc_store_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{storeId}
+            #{id}
         </foreach>
     </delete>
 </mapper>