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

开业筹备阶段6.0

Browse Source
This commit is contained in:
shuo.wang
2024-04-28 14:22:32 +08:00
parent 8901681cef
commit e1208ac8ee
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
Map<String, Object> requestMap = new HashMap<>();
fillSignatureInfo(requestMap);
try {
String url = xfsgUrl + Constants.FRANCHISEE_STORE_NUM +
String url = xfsgUrl + Constants.FIRST_ORDER +
"?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature")+
"&storeCode=" + shopCode;
JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>());
@@ -150,8 +150,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
throw new ServiceException(ErrorCodeEnum. GET_FIRST_ORDER);
}
}
private void fillSignatureInfo(Map<String, Object> requestMap) {
long timestamp = System.currentTimeMillis();
String signature = SecureUtil.getSignature(timestamp);

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -74,12 +74,16 @@ public class FirstOrderServiceImp implements FirstOrderService {
order.setUpdateTime(new Date());
order.setUpdateUserId(userId);
Integer num = firstOrderDAO.insertFirstOrder(order);
shopStageInfoDAO.updateShopStageAndAuditInfo(order.getShopId(),
ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152, null);
//云立方同步
if (num > 0) {
try {
ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId());
String shopCode = shopInfo.getShopCode();
Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode);
// ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId());
// String shopCode = shopInfo.getShopInfopCode();
// String shopCode = "31310383";
// Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode);
Boolean flag = Boolean.TRUE;
log.info("saveOrder,flag:{}", flag);
if (flag == null) {
throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER);

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -196,9 +196,10 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
try {
if (orderStageInfo.getShopSubStageStatus().
equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) {
ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
String shopCode = shopInfo.getShopCode();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
// ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
// String shopCode = shopInfo.getShopCode();
// Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
Boolean firstOrder =Boolean.TRUE;
log.info("saveOrder,flag:{}", firstOrder);
if (firstOrder) {
//更改子阶段状态