chenjiahe
2023-12-11 d5331600ac24540d180390854cb898dffbfe9345
Merge branch 'master' into master-prod-new
1个文件已修改
11 ■■■■■ 已修改文件
phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionSingleServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionSingleServiceImpl.java
@@ -11,6 +11,7 @@
import com.hx.phiappt.constants.tool.PerformanceInfoTool;
import com.hx.phiappt.constants.tool.UserInfoTool;
import com.hx.phiappt.constants.tool.UserStatusTool;
import com.hx.phiappt.constants.tool.appointment.AppointmentTool;
import com.hx.phiappt.constants.tool.user.UserLabelTool;
import com.hx.phiappt.constants.tool.user.UserLevelTool;
import com.hx.phiappt.dao.mapper.ProjectTypeMapper;
@@ -377,6 +378,16 @@
                    // 20220222 修改
                    // throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到符合要求的项目信息!");
                }
                //------检测非繁忙划扣项目
                List<Project> projectList = new ArrayList<>();
                Project project = commonService.selectOneByKey(ProjectMapper.class,userProjectItem.getGoodsId());
                if(project != null){
                    projectList.add(project);
                    //检测非繁忙划扣项目
                    AppointmentTool.paddleProjectNonBusy(shop.getId(),new Date(),projectList,null,commonService);
                }
            }
            // 划扣判断订单是否在审核退款或者取消订单了