qu

yamada-fcbi/src/main/java/jp/yamada/fcbi/constants/PrefixIdConstants.java

@@ -21,6 +21,11 @@ public class PrefixIdConstants {
     public static final String SURVEY_ID = "S";
 
     /**
+     * FC会員とPOSレジの関連設定
+     */
+    public static final String POS_ID = "P";
+
+    /**
      * アクションアンケート-ブランド関連表
      */
     public static final String SURVEY_BRAND_ID = "SB";

yamada-fcbi/src/main/java/jp/yamada/fcbi/controller/YmdfFcMemberController.java

@@ -131,7 +131,31 @@ public class YmdfFcMemberController extends BaseController
      * 会員情報POS編集
      */
     @PostMapping("/memberPosEdit")
-    public AjaxResult getMemberPosEditInfo(@RequestBody YmdfFcMemberPosParam ymdfFcMemberPosParam) {
-        return success(ymdfFcMemberService.selectYmdfMemberPosEditList(ymdfFcMemberPosParam));
+    public TableDataInfo getMemberPosEditInfo(@RequestBody YmdfFcMemberPosParam ymdfFcMemberPosParam)
+    {
+        startPage();
+        List<YmdfFcMemberPosParam> list = ymdfFcMemberService.selectYmdfMemberPosEditList(ymdfFcMemberPosParam);
+        return getDataTable(list);
+    }
+
+    /**
+     * FC会員とPOSレジの関連設定
+     */
+    @PreAuthorize("@ss.hasPermi('system:member:updatePos')")
+    @Log(title = "FC会員とPOSレジの関連設定", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePos")
+    public AjaxResult updatePos(@RequestBody YmdfFcMemberPosParam ymdfFcMemberPosParam) {
+        return toAjax(ymdfFcMemberService.updatePos(ymdfFcMemberPosParam));
+    }
+
+    /**
+     * 新增FC会員とPOSレジの関連設定
+     */
+    @PreAuthorize("@ss.hasPermi('system:member:add')")
+    @Log(title = "FC会員とPOSレジの関連設定", businessType = BusinessType.INSERT)
+    @PostMapping("/memberPos")
+    public AjaxResult addMemberPos(@RequestBody YmdfFcMemberPosParam ymdfFcMemberPosParam)
+    {
+        return toAjax(ymdfFcMemberService.insertYmdfFcMemberPos(ymdfFcMemberPosParam));
     }
 }

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

@@ -111,7 +111,7 @@ public class YmdfFcMember extends BaseEntity
 
     /** バージョン */
     @Excel(name = "バージョン")
-    private Integer version;
+    private String version;
 
     /** してブランド名 */
     private String brandName;

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

@@ -41,6 +41,14 @@ public interface YmdfFcMemberMapper
     public int insertYmdfFcMember(YmdfFcMember ymdfFcMember);
 
     /**
+     * 新增FC会員とPOSレジの関連設定
+     *
+     * @param ymdfFcMember FC会員とPOSレジの関連設定
+     * @return 结果
+     */
+    public int insertYmdfFcMemberPos(YmdfFcMember ymdfFcMember);
+
+    /**
      * 修改FC会員基本情報
      * 
      * @param ymdfFcMember FC会員基本情報
@@ -73,6 +81,13 @@ public interface YmdfFcMemberMapper
     public int updateMemberPassword(YmdfFcMember ymdfFcMember);
 
     /**
+     * FC会員とPOSレジの関連設定
+     * @param ymdfFcMember FC会員とPOSレジの関連設定
+     * @return 结果
+     */
+    public int updatePos(YmdfFcMember ymdfFcMember);
+
+    /**
      * 会員情報編集
      *
      * @param fcMemberId 会員情報編集
@@ -86,5 +101,5 @@ public interface YmdfFcMemberMapper
      * @param ymdfFcMember 会員情報POS編集
      * @return 会員情報POS編集
      */
-    public YmdfFcMember selectYmdfMemberPosEditList(YmdfFcMember ymdfFcMember);
+    public List<YmdfFcMember> selectYmdfMemberPosEditList(YmdfFcMember ymdfFcMember);
 }

yamada-fcbi/src/main/java/jp/yamada/fcbi/service/IYmdfFcMemberService.java

@@ -45,6 +45,14 @@ public interface IYmdfFcMemberService {
     public int insertYmdfFcMember(YmdfFcMember ymdfFcMember);
 
     /**
+     * 新增FC会員とPOSレジの関連設定
+     *
+     * @param ymdfFcMemberPosParam FC会員とPOSレジの関連設定
+     * @return 结果
+     */
+    public int insertYmdfFcMemberPos(YmdfFcMemberPosParam ymdfFcMemberPosParam);
+
+    /**
      * 修改FC会員基本情報
      *
      * @param ymdfFcMember FC会員基本情報
@@ -77,6 +85,14 @@ public interface IYmdfFcMemberService {
     public int resetPwd(YmdfFcMember ymdfFcMember);
 
     /**
+     * FC会員とPOSレジの関連設定
+     *
+     * @param ymdfFcMemberPosParam FC会員とPOSレジの関連設定
+     * @return 結果
+     */
+    public int updatePos(YmdfFcMemberPosParam ymdfFcMemberPosParam);
+
+    /**
      * 会員情報編集
      *
      * @param ymdfFcMember 会員情報編集
@@ -90,5 +106,5 @@ public interface IYmdfFcMemberService {
      * @param ymdfFcMemberPosParam 会員情報POS編集
      * @return 会員情報POS編集
      */
-    public YmdfFcMember selectYmdfMemberPosEditList(YmdfFcMemberPosParam ymdfFcMemberPosParam);
+    public List<YmdfFcMemberPosParam> selectYmdfMemberPosEditList(YmdfFcMemberPosParam ymdfFcMemberPosParam);
 }    

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

@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -222,6 +223,41 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
     }
 
     /**
+     * 新增FC会員とPOSレジの関連設定
+     *
+     * @param ymdfFcMemberPosParam FC会員とPOSレジの関連設定
+     * @return 结果
+     */
+    @Override
+    public int insertYmdfFcMemberPos(YmdfFcMemberPosParam ymdfFcMemberPosParam)
+    {
+        YmdfFcMember ymdfFcMember = new YmdfFcMember();
+        String id = IdUtils.nextIdStr(PrefixIdConstants.POS_ID);
+        ymdfFcMember.setId(id);
+        ymdfFcMember.setCreateTime(DateUtils.getNowDate());
+        ymdfFcMember.setFcMemberId(ymdfFcMemberPosParam.getFcMemberId());
+        ymdfFcMember.setPosId(ymdfFcMemberPosParam.getPosId());
+        ymdfFcMember.setPosType(ymdfFcMemberPosParam.getPosType());
+        ymdfFcMember.setPosModel(ymdfFcMemberPosParam.getPosModel());
+        ymdfFcMember.setPosInstallDate(ymdfFcMemberPosParam.getPosInstallDate());
+        ymdfFcMember.setPosLinkInfo(ymdfFcMemberPosParam.getPosLinkInfo());
+        ymdfFcMember.setCustomSettings(ymdfFcMemberPosParam.getCustomSettings());
+        ymdfFcMember.setPosStatus(ymdfFcMemberPosParam.getPosStatus());
+        ymdfFcMember.setApiAccessKey(ymdfFcMemberPosParam.getApiAccessKey());
+        ymdfFcMember.setPosSyncStatus(ymdfFcMemberPosParam.getPosSyncStatus());
+        ymdfFcMember.setPosUpdateRequired(ymdfFcMemberPosParam.getPosUpdateRequired());
+        ymdfFcMember.setPosUpdateReason(ymdfFcMemberPosParam.getPosUpdateReason());
+        ymdfFcMember.setPosSerialNumber(ymdfFcMemberPosParam.getPosSerialNumber());
+        ymdfFcMember.setLastUpdated(ymdfFcMemberPosParam.getLastUpdated());
+        ymdfFcMember.setActivationCode(ymdfFcMemberPosParam.getActivationCode());
+        ymdfFcMember.setDataSyncInterval(ymdfFcMemberPosParam.getDataSyncInterval());
+        ymdfFcMember.setLastSyncTime(ymdfFcMemberPosParam.getLastSyncTime());
+        ymdfFcMember.setPosConfigVersion(ymdfFcMemberPosParam.getPosConfigVersion());
+
+        return ymdfFcMemberMapper.insertYmdfFcMemberPos(ymdfFcMember);
+    }
+
+    /**
      * 修改FC会員基本情報
      *
      * @param ymdfFcMember FC会員基本情報
@@ -280,6 +316,42 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
     }
 
     /**
+     * 会員管理
+     *
+     * @param ymdfFcMemberPosParam 会員管理
+     * @return 結果
+     */
+    @Override
+    public int updatePos(YmdfFcMemberPosParam ymdfFcMemberPosParam) {
+        YmdfFcMember ymdfFcMember = new YmdfFcMember();
+        ymdfFcMember.setUpdateTime(DateUtils.getNowDate());
+        ymdfFcMember.setFcMemberId(ymdfFcMemberPosParam.getFcMemberId());
+        ymdfFcMember.setVersion(ymdfFcMemberPosParam.getVersion());
+        ymdfFcMember.setPosType(ymdfFcMemberPosParam.getPosType());
+        ymdfFcMember.setPosModel(ymdfFcMemberPosParam.getPosModel());
+        ymdfFcMember.setPosInstallDate(ymdfFcMemberPosParam.getPosInstallDate());
+        ymdfFcMember.setPosLinkInfo(ymdfFcMemberPosParam.getPosLinkInfo());
+        ymdfFcMember.setCustomSettings(ymdfFcMemberPosParam.getCustomSettings());
+        ymdfFcMember.setPosStatus(ymdfFcMemberPosParam.getPosStatus());
+        ymdfFcMember.setApiAccessKey(ymdfFcMemberPosParam.getApiAccessKey());
+        ymdfFcMember.setPosSyncStatus(ymdfFcMemberPosParam.getPosSyncStatus());
+        ymdfFcMember.setPosUpdateRequired(ymdfFcMemberPosParam.getPosUpdateRequired());
+        ymdfFcMember.setPosUpdateReason(ymdfFcMemberPosParam.getPosUpdateReason());
+        ymdfFcMember.setPosSerialNumber(ymdfFcMemberPosParam.getPosSerialNumber());
+        ymdfFcMember.setLastUpdated(ymdfFcMemberPosParam.getLastUpdated());
+        ymdfFcMember.setActivationCode(ymdfFcMemberPosParam.getActivationCode());
+        ymdfFcMember.setDataSyncInterval(ymdfFcMemberPosParam.getDataSyncInterval());
+        ymdfFcMember.setLastSyncTime(ymdfFcMemberPosParam.getLastSyncTime());
+        ymdfFcMember.setPosConfigVersion(ymdfFcMemberPosParam.getPosConfigVersion());
+        int resultMember = ymdfFcMemberMapper.updatePos(ymdfFcMember);
+
+        if (resultMember < 1) {
+            throw new ServiceException(MessageUtils.message("E0007"));
+        }
+        return resultMember;
+    }
+
+    /**
      * 会員情報編集
      *
      * @param ymdfFcMember 会員情報編集
@@ -298,11 +370,21 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
      * @return 会員情報POS編集
      */
     @Override
-    public YmdfFcMember selectYmdfMemberPosEditList(YmdfFcMemberPosParam ymdfFcMemberPosParam) {
+    public List<YmdfFcMemberPosParam> selectYmdfMemberPosEditList(YmdfFcMemberPosParam ymdfFcMemberPosParam) {
         YmdfFcMember ymdfFcMember = new YmdfFcMember();
-        // 将参数对象的属性复制到查询对象中
         BeanUtils.copyProperties(ymdfFcMemberPosParam, ymdfFcMember);
-        // 直接返回 Mapper 查询的结果（此时类型匹配）
-        return ymdfFcMemberMapper.selectYmdfMemberPosEditList(ymdfFcMember);
+
+        // 获取Mapper查询结果
+        List<YmdfFcMember> memberList = ymdfFcMemberMapper.selectYmdfMemberPosEditList(ymdfFcMember);
+
+        // 转换为目标类型列表
+        List<YmdfFcMemberPosParam> resultList = new ArrayList<>();
+        for (YmdfFcMember member : memberList) {
+            YmdfFcMemberPosParam param = new YmdfFcMemberPosParam();
+            BeanUtils.copyProperties(member, param);
+            resultList.add(param);
+        }
+
+        return resultList;
     }
 }

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

@@ -282,6 +282,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <insert id="insertYmdfFcMemberPos" parameterType="YmdfFcMember">
+        insert into ymdf_fc_member_pos
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="fcMemberId != null and fcMemberId != ''">fc_member_id,</if>
+            <if test="posId != null and posId != ''">pos_id,</if>
+            <if test="posType != null and posType != ''">pos_type,</if>
+            <if test="posModel != null">pos_model,</if>
+            <if test="posSerialNumber != null and posSerialNumber != ''">pos_serial_number,</if>
+            <if test="posInstallDate != null">pos_install_date,</if>
+            <if test="posLinkInfo != null">pos_link_info,</if>
+            <if test="customSettings != null">custom_settings,</if>
+            <if test="posStatus != null">pos_status,</if>
+            <if test="lastUpdated != null">last_updated,</if>
+            <if test="activationCode != null">activation_code,</if>
+            <if test="apiAccessKey != null">api_access_key,</if>
+            <if test="dataSyncInterval != null">data_sync_interval,</if>
+            <if test="posSyncStatus != null">pos_sync_status,</if>
+            <if test="lastSyncTime != null">last_sync_time,</if>
+            <if test="posUpdateRequired != null">pos_update_required,</if>
+            <if test="posConfigVersion != null">pos_config_version,</if>
+            <if test="posUpdateReason != null">pos_update_reason,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="version != null">version,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="fcMemberId != null and fcMemberId != ''">#{fcMemberId},</if>
+            <if test="posId != null and posId != ''">#{posId},</if>
+            <if test="posType != null and posType != ''">#{posType},</if>
+            <if test="posModel != null">#{posModel},</if>
+            <if test="posSerialNumber != null and posSerialNumber != ''">#{posSerialNumber},</if>
+            <if test="posInstallDate != null">#{posInstallDate},</if>
+            <if test="posLinkInfo != null">#{posLinkInfo},</if>
+            <if test="customSettings != null">#{customSettings},</if>
+            <if test="posStatus != null">#{posStatus},</if>
+            <if test="lastUpdated != null">#{lastUpdated},</if>
+            <if test="activationCode != null">#{activationCode},</if>
+            <if test="apiAccessKey != null">#{apiAccessKey},</if>
+            <if test="dataSyncInterval != null">#{dataSyncInterval},</if>
+            <if test="posSyncStatus != null">#{posSyncStatus},</if>
+            <if test="lastSyncTime != null">#{lastSyncTime},</if>
+            <if test="posUpdateRequired != null">#{posUpdateRequired},</if>
+            <if test="posConfigVersion != null">#{posConfigVersion},</if>
+            <if test="posUpdateReason != null">#{posUpdateReason},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="version != null">#{version},</if>
+        </trim>
+    </insert>
+
     <update id="updateYmdfFcMember" parameterType="YmdfFcMember">
         update ymdf_fc_member
         <set>
@@ -308,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="version != null">version = version+1,</if>
+            <if test="defaultPosId != null">default_pos_id = #{defaultPosId},</if>
         </set>
         where fc_member_id = #{fcMemberId}
         and del_flag = '0'
@@ -342,6 +403,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="version != null">version = version+1,</if>
+            <if test="defaultPosId != null">default_pos_id = #{defaultPosId},</if>
+        </set>
+        where fc_member_id = #{fcMemberId}
+        and del_flag = '0'
+        <if test="version != null">
+            and version = #{version}
+        </if>
+    </update>
+
+    <update id="updatePos" parameterType="YmdfFcMember">
+        update ymdf_fc_member_pos
+        <set>
+            <if test="fcMemberId != null and fcMemberId != ''">fc_member_id = #{fcMemberId},</if>
+            <if test="posId != null and posId != ''">pos_id = #{posId},</if>
+            <if test="posType != null and posType != ''">pos_type = #{posType},</if>
+            <if test="posModel != null">pos_model = #{posModel},</if>
+            <if test="posSerialNumber != null and posSerialNumber != ''">pos_serial_number = #{posSerialNumber},</if>
+            <if test="posInstallDate != null">pos_install_date = #{posInstallDate},</if>
+            <if test="posLinkInfo != null">pos_link_info = #{posLinkInfo},</if>
+            <if test="customSettings != null">custom_settings = #{customSettings},</if>
+            <if test="posStatus != null">pos_status = #{posStatus},</if>
+            <if test="lastUpdated != null">last_updated = #{lastUpdated},</if>
+            <if test="activationCode != null">activation_code = #{activationCode},</if>
+            <if test="apiAccessKey != null">api_access_key = #{apiAccessKey},</if>
+            <if test="dataSyncInterval != null">data_sync_interval = #{dataSyncInterval},</if>
+            <if test="posSyncStatus != null">pos_sync_status = #{posSyncStatus},</if>
+            <if test="lastSyncTime != null">last_sync_time = #{lastSyncTime},</if>
+            <if test="posUpdateRequired != null">pos_update_required = #{posUpdateRequired},</if>
+            <if test="posConfigVersion != null">pos_config_version = #{posConfigVersion},</if>
+            <if test="posUpdateReason != null">pos_update_reason = #{posUpdateReason},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="version != null">version = version+1,</if>
         </set>
         where fc_member_id = #{fcMemberId}
         and del_flag = '0'