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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-28 16:30:18 +08:00
parent 03ce2c71af f626c53461
commit 5ecf6e2bb5
8 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ public class PCApplyLicenseController {
* @param status 0通过 1不通过
* @return
*/
@PostMapping(path = "/examine")
@GetMapping(path = "/examine")
@ApiOperation("证照审批列表")
public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
@RequestParam("status") Integer status,

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

@@ -42,7 +42,7 @@ public class ApplyLicenseController {
* @param status 0通过 1不通过
* @return
*/
@PostMapping(path = "/examine")
@GetMapping(path = "/examine")
@ApiOperation("证照审批列表")
public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
@RequestParam("status") Integer status,

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