bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts

This commit is contained in:
sxu 2025-04-03 17:24:11 +08:00
parent 3735286f66
commit 7d0572cc6d
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/CleaningServicesOrderServiceImpl.java
View File

@ -56,7 +56,7 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
private AjaxResult payment(CleaningServicesOrder dto) { private AjaxResult payment(CleaningServicesOrder dto) {
PaymentDto bean = new PaymentDto(); PaymentDto bean = new PaymentDto();
bean.setMoney(dto.getUsePrice()); bean.setMoney(dto.getUsePrice());
bean.setCustId(SecurityUtils.getLoginUser().getCustId()); bean.setCustId(SecurityUtils.getUserId());
try { try {
if (ObjectUtil.isEmpty(dto.getUsePrice())) { if (ObjectUtil.isEmpty(dto.getUsePrice())) {
throw new IllegalArgumentException("价格不能为空"); throw new IllegalArgumentException("价格不能为空");
@ -80,7 +80,9 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
} catch (Exception e) { } catch (Exception e) {
//调用食堂卡退款 //调用食堂卡退款
AjaxResult refundResultVo = refundOperation(bean); AjaxResult refundResultVo = refundOperation(bean);
if (refundResultVo != null) return refundResultVo; if (refundResultVo != null) {
return refundResultVo;
}
//删除当前订单 //删除当前订单
int delCode = dao.deleteById(dto.getId()); int delCode = dao.deleteById(dto.getId());
if (delCode == 0) { if (delCode == 0) {

6
bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/TherapyAppointmentsServiceImpl.java
View File

@ -97,7 +97,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
dto.setCreatedBy(SecurityUtils.getUsername()); dto.setCreatedBy(SecurityUtils.getUsername());
dto.setCreatedTime(new Date()); dto.setCreatedTime(new Date());
dto.setUserId(String.valueOf(SecurityUtils.getUserId())); dto.setUserId(String.valueOf(SecurityUtils.getUserId()));
dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId())); dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
dto.setIsDeleted("0"); dto.setIsDeleted("0");
List<DictDataInfoDO> equipmentTypeList = dictDataApi.getDictionaryInfo("time_slot"); List<DictDataInfoDO> equipmentTypeList = dictDataApi.getDictionaryInfo("time_slot");
//拿到数据字典 //拿到数据字典
@ -124,7 +124,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
PaymentDto bean = new PaymentDto(); PaymentDto bean = new PaymentDto();
bean.setMoney(dto.getProjectPrice()); bean.setMoney(dto.getProjectPrice());
bean.setCustId(SecurityUtils.getLoginUser().getCustId()); bean.setCustId(SecurityUtils.getUserId());
//调用食堂卡支付 //调用食堂卡支付
AjaxResult result = otherServiceClient.payMoneyForStage(bean); AjaxResult result = otherServiceClient.payMoneyForStage(bean);
@ -135,7 +135,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
//新增订单信息 -- 出错调用退款 //新增订单信息 -- 出错调用退款
dto.setOrderPayInfo(ajaxResultVo.getMsg()); dto.setOrderPayInfo(ajaxResultVo.getMsg());
dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId())); dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
AjaxResult insertOrderInfoResult = insertOrderInfo(dto, bean, ajaxResultVo); AjaxResult insertOrderInfoResult = insertOrderInfo(dto, bean, ajaxResultVo);
AjaxResultVo insertOrderInfoErrorVo = JSON.parseObject(JSON.toJSONString(insertOrderInfoResult), AjaxResultVo.class); AjaxResultVo insertOrderInfoErrorVo = JSON.parseObject(JSON.toJSONString(insertOrderInfoResult), AjaxResultVo.class);

2
bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/WashClothingOrderServiceImpl.java
View File

@ -181,7 +181,7 @@ public class WashClothingOrderServiceImpl extends ServiceImpl<WashClothingOrderM
greenOrder.setCreatedBy(userInfo.getLoginName()); greenOrder.setCreatedBy(userInfo.getLoginName());
greenOrder.setCreatedTime(new Date()); greenOrder.setCreatedTime(new Date());
greenOrder.setUserId(userInfo.getUserId()); greenOrder.setUserId(userInfo.getUserId());
greenOrder.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId())); greenOrder.setCustId(String.valueOf(SecurityUtils.getUserId()));
greenOrder.setIsDeleted("0"); greenOrder.setIsDeleted("0");
greenOrder.setOrderTime(new Date()); greenOrder.setOrderTime(new Date());
//流水号 //流水号

2
bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-jyy_canteen_local.yml
View File

@ -1,6 +1,6 @@
# Tomcat # Tomcat
server: server:
port: 51189 port: 48388
# Spring # Spring
spring: spring: