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

设计阶段bug

Browse Source
This commit is contained in:
苏竹红
2024-06-26 10:42:10 +08:00
parent bcc40243fa
commit a2b1fc3873
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java
View File

@@ -28,8 +28,8 @@ public class DecorationDesignInfoDAO {
return decorationDesignInfoMapper.insertSelective(decorationDesignInfoDO);
}
public Integer updateByPrimaryKey(DecorationDesignInfoDO decorationDesignInfoDO){
return decorationDesignInfoMapper.updateByPrimaryKey(decorationDesignInfoDO);
public Integer updateByPrimaryKeySelective(DecorationDesignInfoDO decorationDesignInfoDO){
return decorationDesignInfoMapper.updateByPrimaryKeySelective(decorationDesignInfoDO);
}
public DecorationDesignInfoDO getByShopId(Long shopId){

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

@@ -540,7 +540,7 @@ public class DecorationServiceImpl implements DecorationService {
DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId());
if (Objects.nonNull(decoration)){
decorationDesignInfoDO.setId(decoration.getId());
decorationDesignInfoDAO.updateByPrimaryKey(decorationDesignInfoDO);
decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO);
}else {
decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO);
}
@@ -580,7 +580,7 @@ public class DecorationServiceImpl implements DecorationService {
DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId());
if (Objects.nonNull(decoration)){
decorationDesignInfoDO.setId(decoration.getId());
decorationDesignInfoDAO.updateByPrimaryKey(decorationDesignInfoDO);
decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO);
}
//更新装修设计状态
shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111));

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

@@ -11,6 +11,7 @@ import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.DecorationService;
import com.cool.store.service.PreparationService;
import com.cool.store.service.SeeAcceptanceService;
import com.cool.store.vo.DecorationDesignVO;
import com.cool.store.vo.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO;
@@ -130,6 +131,12 @@ public class PCDecorationController {
return ResponseResult.success(decorationService.submitDecorationDesign(request,CurrentUserHolder.getUser()));
}
@ApiOperation("查询设计方案")
@GetMapping("/getDecorationDesign")
public ResponseResult<DecorationDesignVO> getDecorationDesign(@RequestParam Long shopId){
return ResponseResult.success(decorationService.getDecorationDesign(shopId));
}
@ApiOperation("装修阶段完成")
@PostMapping("/confirmComplete")
public ResponseResult<Boolean> confirmComplete(@RequestParam Long shopId){

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

@@ -124,8 +124,8 @@ public class MiniDecorationController {
@ApiOperation("加盟商确定设计方案")
@PostMapping("/confirmDesign")
public ResponseResult<Boolean> confirmDesign(@RequestParam DecorationDesignRequest shopId){
return ResponseResult.success(decorationService.confirmDesign(shopId,CurrentUserHolder.getUser()));
public ResponseResult<Boolean> confirmDesign(@RequestBody DecorationDesignRequest request){
return ResponseResult.success(decorationService.confirmDesign(request,CurrentUserHolder.getUser()));
}