suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:云流水

Browse Source
This commit is contained in:
苏竹红
2025-04-16 15:08:23 +08:00
parent 9a09be5ce3
commit 6fb703d624
7 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/ShopAccountEnum.java
View File

@@ -23,7 +23,7 @@ public enum ShopAccountEnum {
public static List<String> getSpecialList(){ public static List<String> getSpecialList(){
return Arrays.asList(HUOMA.getSystemName(),YLS.getSystemName(),XZG.getSystemName()); return Arrays.asList(HUOMA.getSystemName(),XZG.getSystemName());
} }
public static List<ShopAccountEnum> getSpecialEnumList(){ public static List<ShopAccountEnum> getSpecialEnumList(){

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java
View File

@@ -85,8 +85,8 @@ public class ShopAccountDAO {
* @param status 状态 * @param status 状态
* @return 影响的行数 * @return 影响的行数
*/ */
public int updateStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status,Date syncTime){ public int updateStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status,Date syncTime,String ylsCode){
return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status,syncTime); return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status,syncTime,ylsCode);
} }
public int updateEntryStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status){ public int updateEntryStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status){

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java
View File

@@ -43,7 +43,9 @@ public interface ShopAccountMapper extends Mapper<ShopAccountDO> {
int updateStatusByShopIdAndSystemName( int updateStatusByShopIdAndSystemName(
@Param("shopId") Long shopId, @Param("shopId") Long shopId,
@Param("systemNameList") List<String> systemNameList, @Param("systemNameList") List<String> systemNameList,
@Param("status") Integer status, @Param("syncTime") Date lastSyncTime @Param("status") Integer status,
@Param("syncTime") Date lastSyncTime,
@Param("ylsCode") String ylsCode
); );
int updateEntryStatusByShopIdAndSystemName( int updateEntryStatusByShopIdAndSystemName(

3
coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml
View File

@@ -103,6 +103,9 @@
<if test="syncTime != null"> <if test="syncTime != null">
last_sync_time = #{syncTime}, last_sync_time = #{syncTime},
</if> </if>
<if test="ylsCode != null">
account = #{ylsCode},
</if>
</set> </set>
WHERE WHERE
shop_id = #{shopId} shop_id = #{shopId}

37
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenApiServiceImpl.java
View File

@@ -16,7 +16,9 @@ import com.cool.store.request.PostAndOrderRequest;
import com.cool.store.service.OpenApiService; import com.cool.store.service.OpenApiService;
import com.cool.store.service.PosAndOrderInfoService; import com.cool.store.service.PosAndOrderInfoService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
@@ -42,27 +44,38 @@ public class OpenApiServiceImpl implements OpenApiService {
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Boolean statusRefresh(StatusRefreshDTO statusRefreshDTO) { 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)){ if (Objects.isNull(shopInfoDO)){
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
Integer openStatus = statusRefreshDTO.getOpenStatus()?OpenStatusEnum.OPENSTATUSENUM_5.getCode():OpenStatusEnum.OPENSTATUSENUM_6.getCode(); 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 (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){
if (Objects.isNull(shopAccountDO)){ ShopAccountDO shopAccountDO = accountDAO.selectByShopIdAndSystemName(shopInfoDO.getId(), ShopAccountEnum.YLS.getSystemName());
throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR); 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; return Boolean.TRUE;
} }

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
View File

@@ -329,7 +329,7 @@ public class PreparationServiceImpl implements PreparationService {
ShopAccountEnum.MT.getSystemName(), ShopAccountEnum.MT.getSystemName(),
ShopAccountEnum.ELM.getSystemName(), ShopAccountEnum.ELM.getSystemName(),
ShopAccountEnum.DY.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); log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3);
//都完成了 状态修改 //都完成了 状态修改
if (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; return Boolean.TRUE;
@@ -369,7 +369,7 @@ public class PreparationServiceImpl implements PreparationService {
List<String> list = Arrays.asList( List<String> list = Arrays.asList(
ShopAccountEnum.YLS.getSystemName(), ShopAccountEnum.YLS.getSystemName(),
ShopAccountEnum.XZG.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; return Boolean.TRUE;

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
list.add(ShopAccountEnum.YLS.getSystemName()); list.add(ShopAccountEnum.YLS.getSystemName());
} }
OpenStatusEnum openStatusEnum = accountAuditDTO.getAuditFlag() == 1 ? OpenStatusEnum.OPENSTATUSENUM_4 : OpenStatusEnum.OPENSTATUSENUM_3; 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; return Boolean.TRUE;
} }
@@ -213,7 +213,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){ if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){
Boolean successFlag = pushService.pushDataToPOS(data); Boolean successFlag = pushService.pushDataToPOS(data);
OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6; 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 postAndOrderRequest = new PostAndOrderRequest();
postAndOrderRequest.setShopId(accountAuditDTO.getShopId()); postAndOrderRequest.setShopId(accountAuditDTO.getShopId());