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

修改定时任务

Browse Source
This commit is contained in:
shuo.wang
2024-05-13 14:35:46 +08:00
parent c091a520b5
commit 34b5bbb27f
12 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java
View File

@@ -37,7 +37,7 @@ public interface CoolStoreStartFlowService {
* @Date: 2024/4/25
* @description:获取订货金
*/
Boolean getFirstOrder(String shopCode);
Boolean getFirstOrder(String shopNum);
/**
* @Auther: wangshuo
* @Date: 2024/5/8

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

@@ -85,9 +85,9 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
@Override
public Boolean getFirstOrder(String shopCode) {
log.info("getFirstOrder shopCode:{}", shopCode);
if (Objects.isNull(shopCode)) {
public Boolean getFirstOrder(String shopNum) {
log.info("getFirstOrder shopNum:{}", shopNum);
if (Objects.isNull(shopNum)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
Map<String, Object> requestMap = new HashMap<>();
@@ -95,7 +95,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
try {
String url = xfsgUrl + Constants.FIRST_ORDER +
"?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature") +
"&storeCode=" + shopCode;
"&storeCode=" + shopNum;
JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>());
log.info("get url:{},jsonObject:{}", url, jsonObject);
Boolean flag = (Boolean) jsonObject.get("data");

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -682,7 +682,7 @@ public class DecorationServiceImpl implements DecorationService {
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(request.getShopId());
acceptanceInfoDO.setBookingUser(user.getUserId());
acceptanceInfoDO.setUpdateTime(new Date());
acceptanceInfoDO.setPlanAcceptanceTime(new Date());
acceptanceInfoDO.setPlanAcceptanceTime(request.getBookingAcceptanceTime());
acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
return Boolean.TRUE;
}

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

@@ -7,7 +7,6 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*;
import com.cool.store.dto.Preparation.PreparationDTO;
import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
import com.cool.store.dto.openPreparation.OpeningOperationPlanDTO;
import com.cool.store.dto.openPreparation.PlanLineDTO;
import com.cool.store.dto.openPreparation.UserNameDTO;
import com.cool.store.entity.EnterpriseUserDO;
@@ -200,8 +199,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus().
equals(orderStageInfo.getShopSubStageStatus())) {
ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
String shopCode = shopInfo.getShopCode();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
String shopNum = shopInfo.getStoreNum();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopNum);
log.info("saveOrder,flag:{}", firstOrder);
if (firstOrder) {
//更改子阶段状态
@@ -222,8 +221,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
public Boolean getStatus(Long shopId) {
try{
ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
String shopCode = shopInfo.getShopCode();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
String shopNum = shopInfo.getStoreNum();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopNum);
return firstOrder;
}catch (Exception e){
log.error("获取鲜丰订货金异常或更新状态失败");

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class YlfServiceImpl implements YlfService {
return rows.get(0);
}
} else {
log.info("获取云立方装修公司信息失败,shopCode:{}", storeNum);
log.info("获取云立方装修公司信息失败,shopNum:{}", storeNum);
throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
}
} catch (Exception e) {