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<>(); Map<String, Object> requestMap = new HashMap<>();
fillSignatureInfo(requestMap); fillSignatureInfo(requestMap);
try { try {
String url = xfsgUrl + Constants.FRANCHISEE_STORE_NUM + String url = xfsgUrl + Constants.FIRST_ORDER +
"?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature")+ "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature")+
"&storeCode=" + shopCode; "&storeCode=" + shopCode;
JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>()); 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); throw new ServiceException(ErrorCodeEnum. GET_FIRST_ORDER);
} }
} }
private void fillSignatureInfo(Map<String, Object> requestMap) { private void fillSignatureInfo(Map<String, Object> requestMap) {
long timestamp = System.currentTimeMillis(); long timestamp = System.currentTimeMillis();
String signature = SecureUtil.getSignature(timestamp); 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.setUpdateTime(new Date());
order.setUpdateUserId(userId); order.setUpdateUserId(userId);
Integer num = firstOrderDAO.insertFirstOrder(order); Integer num = firstOrderDAO.insertFirstOrder(order);
shopStageInfoDAO.updateShopStageAndAuditInfo(order.getShopId(),
ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152, null);
//云立方同步 //云立方同步
if (num > 0) { if (num > 0) {
try { try {
ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); // ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId());
String shopCode = shopInfo.getShopCode(); // String shopCode = shopInfo.getShopInfopCode();
Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); // String shopCode = "31310383";
// Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode);
Boolean flag = Boolean.TRUE;
log.info("saveOrder,flag:{}", flag); log.info("saveOrder,flag:{}", flag);
if (flag == null) { if (flag == null) {
throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); 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 { try {
if (orderStageInfo.getShopSubStageStatus(). if (orderStageInfo.getShopSubStageStatus().
equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) { equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) {
ShopInfoDO shopInfo = shopService.getShopInfo(shopId); // ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
String shopCode = shopInfo.getShopCode(); // String shopCode = shopInfo.getShopCode();
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); // Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
Boolean firstOrder =Boolean.TRUE;
log.info("saveOrder,flag:{}", firstOrder); log.info("saveOrder,flag:{}", firstOrder);
if (firstOrder) { if (firstOrder) {
//更改子阶段状态 //更改子阶段状态

14
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -11,6 +11,7 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.LineInfoMapper;
import com.cool.store.mapper.TrainingExperienceMapper; import com.cool.store.mapper.TrainingExperienceMapper;
import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.mq.util.HttpRestTemplateService;
import com.cool.store.service.CoolStoreStartFlowService;
import com.cool.store.service.PreparationService; import com.cool.store.service.PreparationService;
import com.cool.store.utils.poi.constant.Constants; import com.cool.store.utils.poi.constant.Constants;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
@@ -51,6 +52,8 @@ public class XxlJobHandler {
private ShopInfoDAO shopInfoDAO; private ShopInfoDAO shopInfoDAO;
@Resource @Resource
private ShopStageInfoDAO shopStageInfoDAO; private ShopStageInfoDAO shopStageInfoDAO;
@Resource
private CoolStoreStartFlowService coolStoreStartFlowService;
/** /**
* 每天都将待体验门店信息变更到体验中 * 每天都将待体验门店信息变更到体验中
*/ */
@@ -97,6 +100,7 @@ public class XxlJobHandler {
boolean hasNext =true; boolean hasNext =true;
int PageNum = 1; int PageNum = 1;
int PageSize = 50; int PageSize = 50;
while(hasNext){ while(hasNext){
log.info("----查询更新订货金----"); log.info("----查询更新订货金----");
Page<Long> shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum,PageSize); Page<Long> shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum,PageSize);
@@ -110,14 +114,12 @@ public class XxlJobHandler {
for (Long shopId : map.keySet()){ for (Long shopId : map.keySet()){
String shopCode = map.get(shopId); String shopCode = map.get(shopId);
try { try {
String url = xfsgUrl + Constants.FIRST_ORDER + "?storeCode=" + shopCode; Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>());
log.info("updateFirstOrder url:{},jsonObject:{}",url,jsonObject); if (firstOrder == null) {
String string = jsonObject.getString("data");
if (string == null) {
throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER);
} }
if (string.equals("true")) { if (firstOrder.equals(Boolean.TRUE)) {
shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null);
preparationService.whetherToOpenForAcceptance(shopId); preparationService.whetherToOpenForAcceptance(shopId);
} }