diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopAccountEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopAccountEnum.java index 9a57b14d6..30f00f155 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopAccountEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopAccountEnum.java @@ -23,7 +23,7 @@ public enum ShopAccountEnum { public static List getSpecialList(){ - return Arrays.asList(HUOMA.getSystemName(),YLS.getSystemName(),XZG.getSystemName()); + return Arrays.asList(HUOMA.getSystemName(),XZG.getSystemName()); } public static List getSpecialEnumList(){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java index 917bb3266..ab0d8034c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java @@ -85,8 +85,8 @@ public class ShopAccountDAO { * @param status 状态 * @return 影响的行数 */ - public int updateStatusByShopIdAndSystemName(Long shopId, List systemNameList, Integer status,Date syncTime){ - return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status,syncTime); + public int updateStatusByShopIdAndSystemName(Long shopId, List systemNameList, Integer status,Date syncTime,String ylsCode){ + return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status,syncTime,ylsCode); } public int updateEntryStatusByShopIdAndSystemName(Long shopId, List systemNameList, Integer status){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java index 9b5d4de0d..b6d081dea 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java @@ -43,7 +43,9 @@ public interface ShopAccountMapper extends Mapper { int updateStatusByShopIdAndSystemName( @Param("shopId") Long shopId, @Param("systemNameList") List systemNameList, - @Param("status") Integer status, @Param("syncTime") Date lastSyncTime + @Param("status") Integer status, + @Param("syncTime") Date lastSyncTime, + @Param("ylsCode") String ylsCode ); int updateEntryStatusByShopIdAndSystemName( diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index 9e62d3c59..0f245b9f5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -103,6 +103,9 @@ last_sync_time = #{syncTime}, + + account = #{ylsCode}, + WHERE shop_id = #{shopId} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenApiServiceImpl.java index 2b6ec1bc5..85048bf3a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenApiServiceImpl.java @@ -16,7 +16,9 @@ import com.cool.store.request.PostAndOrderRequest; import com.cool.store.service.OpenApiService; import com.cool.store.service.PosAndOrderInfoService; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; @@ -42,27 +44,38 @@ public class OpenApiServiceImpl implements OpenApiService { @Override + @Transactional(rollbackFor = Exception.class) public Boolean statusRefresh(StatusRefreshDTO statusRefreshDTO) { + //如果是云流水 + String code = statusRefreshDTO.getShopCode(); + String ylsCode = ""; + if (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){ + ylsCode = code; + code = StringUtils.substringAfter(ylsCode, "_"); + } + //查询门店编码 - ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreCode(statusRefreshDTO.getShopCode()); + ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreCode(code); if (Objects.isNull(shopInfoDO)){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } Integer openStatus = statusRefreshDTO.getOpenStatus()?OpenStatusEnum.OPENSTATUSENUM_5.getCode():OpenStatusEnum.OPENSTATUSENUM_6.getCode(); - accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(ShopAccountEnum.YLS.getSystemName(),ShopAccountEnum.XZG.getSystemName()), openStatus,null); + accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(statusRefreshDTO.getSystemSource()), openStatus,null,ylsCode); //订货系统开通完成 - ShopAccountDO shopAccountDO = accountDAO.selectByShopIdAndSystemName(shopInfoDO.getId(), ShopAccountEnum.YLS.getSystemName()); - if (Objects.isNull(shopAccountDO)){ - throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR); + if (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){ + ShopAccountDO shopAccountDO = accountDAO.selectByShopIdAndSystemName(shopInfoDO.getId(), ShopAccountEnum.YLS.getSystemName()); + if (Objects.isNull(shopAccountDO)){ + throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR); + } + PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest(); + postAndOrderRequest.setShopId(shopInfoDO.getId()); + postAndOrderRequest.setType(PosAndOrderEnum.ORDER.getCode()); + postAndOrderRequest.setRemark("已为您开通订货系统账号和密码,密码已加密,初始密码为身份证后6位,可通过加盟小程序修改密码!"); + postAndOrderRequest.setAccount(shopAccountDO.getAccount()); + postAndOrderRequest.setPassword(shopAccountDO.getPassword()); + posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null); } - PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest(); - postAndOrderRequest.setShopId(shopInfoDO.getId()); - postAndOrderRequest.setType(PosAndOrderEnum.ORDER.getCode()); - postAndOrderRequest.setRemark("已为您开通订货系统账号和密码,密码已加密,初始密码为身份证后6位,可通过加盟小程序修改密码!"); - postAndOrderRequest.setAccount(shopAccountDO.getAccount()); - postAndOrderRequest.setPassword(shopAccountDO.getPassword()); - posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index f384e41ec..5be87fa94 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -329,7 +329,7 @@ public class PreparationServiceImpl implements PreparationService { ShopAccountEnum.MT.getSystemName(), ShopAccountEnum.ELM.getSystemName(), ShopAccountEnum.DY.getSystemName()); - shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, list, OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null); + shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, list, OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null); } } } @@ -349,7 +349,7 @@ public class PreparationServiceImpl implements PreparationService { log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3); //都完成了 状态修改 if (flag2 && flag3) { - shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null); + shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null); } } return Boolean.TRUE; @@ -369,7 +369,7 @@ public class PreparationServiceImpl implements PreparationService { List list = Arrays.asList( ShopAccountEnum.YLS.getSystemName(), ShopAccountEnum.XZG.getSystemName()); - shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, list, OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null); + shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, list, OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null); } } return Boolean.TRUE; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index c46f65078..f1fa66591 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -150,7 +150,7 @@ public class ShopAccountServiceImpl implements ShopAccountService { list.add(ShopAccountEnum.YLS.getSystemName()); } OpenStatusEnum openStatusEnum = accountAuditDTO.getAuditFlag() == 1 ? OpenStatusEnum.OPENSTATUSENUM_4 : OpenStatusEnum.OPENSTATUSENUM_3; - shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),list,openStatusEnum.getCode(),null); + shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),list,openStatusEnum.getCode(),null,null); return Boolean.TRUE; } @@ -213,7 +213,7 @@ public class ShopAccountServiceImpl implements ShopAccountService { if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){ Boolean successFlag = pushService.pushDataToPOS(data); OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6; - shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode(),new Date()); + shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode(),new Date(),null); //阶段完成 PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest(); postAndOrderRequest.setShopId(accountAuditDTO.getShopId());