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

开业筹备阶段3.0

Browse Source
This commit is contained in:
shuo.wang
2024-04-26 02:26:15 +08:00
parent 1d274bfe55
commit 1eef5980e7
20 changed files with 115 additions and 117 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/OpenPreparationController.java
View File

@@ -123,7 +123,7 @@ public class OpenPreparationController {
FirstOrderDO firstOrderDO = new FirstOrderDO();
try {
BeanUtils.copyProperties(firstOrderDO, request);
firstOrderService.saveOrder(firstOrderDO);
firstOrderService.saveOrder(request);
return ResponseResult.success();
} catch (IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException(e);

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

@@ -76,9 +76,8 @@ public class MiniOpenPreparationController {
order.setResultType(firstOrderStageInfo.getShopSubStageStatus());
return ResponseResult.success(order);
}
@GetMapping("/firstOrder/flush")
public ResponseResult flush(@RequestParam Long shopId) {
public ResponseResult<FirstOrderDTO> flush(@RequestParam Long shopId) {
ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15);
try {
if (!orderStageInfo.getShopSubStageStatus().
@@ -102,10 +101,9 @@ public class MiniOpenPreparationController {
}
ShopStageInfoDO firstOrderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15);
log.info("flush orderStageInfo:{}", firstOrderStageInfo);
OpenPreparationFlushVO flushVO = new OpenPreparationFlushVO();
flushVO.setShopId(shopId);
flushVO.setFirstOderState(firstOrderStageInfo.getShopSubStageStatus());
return ResponseResult.success(flushVO);
FirstOrderDTO order = firstOrderService.getOrder(shopId);
order.setResultType(firstOrderStageInfo.getShopSubStageStatus());
return ResponseResult.success(order);
}