Browse Source

ソース修正

liuxf 5 months ago
parent
commit
aad8635e0a

+ 2 - 1
yamada-fcbi/src/main/java/jp/yamada/fcbi/service/impl/YmdfContractSyncServiceImpl.java

@@ -9,6 +9,7 @@ import jp.yamada.fcbi.constants.PrefixIdConstants;
 import jp.yamada.fcbi.domain.YmdfFcApplicant;
 import jp.yamada.fcbi.domain.YmdfFcApplicant;
 import jp.yamada.fcbi.domain.YmdfFcContractStatusLog;
 import jp.yamada.fcbi.domain.YmdfFcContractStatusLog;
 import jp.yamada.fcbi.domain.response.ContractStatusResponse;
 import jp.yamada.fcbi.domain.response.ContractStatusResponse;
+import jp.yamada.fcbi.enums.ContractStatusEnum;
 import jp.yamada.fcbi.mapper.YmdfFcApplicantMapper;
 import jp.yamada.fcbi.mapper.YmdfFcApplicantMapper;
 import jp.yamada.fcbi.mapper.YmdfFcContractStatusLogMapper;
 import jp.yamada.fcbi.mapper.YmdfFcContractStatusLogMapper;
 import jp.yamada.fcbi.service.IContractExternalService;
 import jp.yamada.fcbi.service.IContractExternalService;
@@ -77,7 +78,7 @@ public class YmdfContractSyncServiceImpl extends BaseService implements IContrac
                     ymdfFcApplicantMapper.updateYmdfFcApplicant(applicant);
                     ymdfFcApplicantMapper.updateYmdfFcApplicant(applicant);
                     
                     
                     // 5. 契约完成时创建会员和店舗
                     // 5. 契约完成时创建会员和店舗
-                    if (response.getContractStatus() == 4) {
+                    if (ContractStatusEnum.SIGNED.getCode().equals(response.getContractStatus())) {
                         // 4=署名完了
                         // 4=署名完了
                         iFcMemberService.createMemberAndStore(applicant.getFcApplicantId());
                         iFcMemberService.createMemberAndStore(applicant.getFcApplicantId());
                     }
                     }

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

@@ -33,7 +33,7 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
     private final YmdfFcApplicantMapper ymdfApplicantMapper;
     private final YmdfFcApplicantMapper ymdfApplicantMapper;
     private final YmdfFcMemberMapper ymdfFcMemberMapper;
     private final YmdfFcMemberMapper ymdfFcMemberMapper;
     private final YmdfFcStoreMapper ymdfFcStoreMapper;
     private final YmdfFcStoreMapper ymdfFcStoreMapper;
-    private final YmdfFcMemberStoreMapper ymdfFcMemberStoreMapper; // 新增关联表Mapper
+    private final YmdfFcMemberStoreMapper ymdfFcMemberStoreMapper;
 
 
     /**
     /**
      * 电子契约完成后创建会员和店舗
      * 电子契约完成后创建会员和店舗
@@ -48,7 +48,7 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
         }
         }
 
 
         // 2. 校验申请状态是否为"契约完了"
         // 2. 校验申请状态是否为"契约完了"
-        if (!fcApplicant.getApplyStatus().equals(ApplyStatusEnum.CONTRACT_COMPLETED.getCode())) {
+        if (!ApplyStatusEnum.CONTRACT_COMPLETED.getCode().equals(fcApplicant.getApplyStatus())) {
             throw new ServiceException("申请状态异常,无法创建会员,当前状态=" + fcApplicant.getApplyStatus());
             throw new ServiceException("申请状态异常,无法创建会员,当前状态=" + fcApplicant.getApplyStatus());
         }
         }
 
 
@@ -113,16 +113,6 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
         // 设置默认访问级别为管理权限
         // 设置默认访问级别为管理权限
         memberStore.setAccessLevel(3);
         memberStore.setAccessLevel(3);
 
 
-        // 设置创建者和创建时间
-        memberStore.setCreateBy(SecurityUtils.getUsername());
-        memberStore.setCreateTime(DateUtils.getNowDate());
-        memberStore.setUpdateBy(SecurityUtils.getUsername());
-        memberStore.setUpdateTime(DateUtils.getNowDate());
-
-        // 设置版本号和删除标记
-        memberStore.setVersion(1);
-        memberStore.setDelFlag(0);
-
         // 可以从申请信息中获取备注信息
         // 可以从申请信息中获取备注信息
         memberStore.setRemark("由申请自动创建,申请ID:" + applicant.getFcApplicantId());
         memberStore.setRemark("由申请自动创建,申请ID:" + applicant.getFcApplicantId());