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

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
shuo.wang
2025-04-14 11:03:16 +08:00
parent cd111b9120 99f9444176
commit aa8fcb1788
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
import com.cool.store.dao.HyPartnerUserInfoDAO;
import com.cool.store.dao.ShopAccountDAO;
import com.cool.store.dao.ShopInfoDAO;
import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.dto.AccountAuditDTO;
import com.cool.store.dto.AccountEntryStatusAuditDTO;
import com.cool.store.dto.ModifyPasswordDTO;
@@ -15,6 +16,7 @@ import com.cool.store.enums.DownSystemTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.OpenStatusEnum;
import com.cool.store.enums.ShopAccountEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.ZxjpApiRequest;
import com.cool.store.response.MiniShopsResponse;
@@ -50,6 +52,8 @@ public class ShopAccountServiceImpl implements ShopAccountService {
SyncDataService syncDataService;
@Resource
PushService pushService;
@Resource
ShopStageInfoDAO shopStageInfoDAO;
@Override
public List<ShopAccountDTO> getShopAccountByShopId(Long shopId) {
@@ -207,6 +211,8 @@ public class ShopAccountServiceImpl implements ShopAccountService {
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());
//阶段完成
shopStageInfoDAO.updateShopStageInfo(accountAuditDTO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163);
}else {
pushService.pushDataToXGJ(data);
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -112,6 +112,7 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setXzgAccount(shopInfo.getShopCode());
request.setYlsAccount(shopInfo.getShopCode());
request.setWqfAccount(shopInfo.getShopCode());
request.setDownstreamSystemShopName(shopInfo.getShopName());
if (systemType.equals(DownSystemTypeEnum.XGJ)) {
//todo
}

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java
View File

@@ -45,7 +45,7 @@ public class ShopAccountController {
@ApiOperation("根据门店shopId与平台名称查询数据")
@GetMapping("/getData")
public ResponseResult<ZxjpApiRequest> getData(@RequestParam(value = "shopId", required = true) Long shopId,
@RequestParam(value = "systemName", required = true) DownSystemTypeEnum systemName) {
@RequestParam(value = "systemName",required = false) DownSystemTypeEnum systemName) {
return ResponseResult.success(accountService.getData(shopId,systemName));
}