scripts
This commit is contained in:
parent
3735286f66
commit
7d0572cc6d
|
|
@ -56,7 +56,7 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
|
|||
private AjaxResult payment(CleaningServicesOrder dto) {
|
||||
PaymentDto bean = new PaymentDto();
|
||||
bean.setMoney(dto.getUsePrice());
|
||||
bean.setCustId(SecurityUtils.getLoginUser().getCustId());
|
||||
bean.setCustId(SecurityUtils.getUserId());
|
||||
try {
|
||||
if (ObjectUtil.isEmpty(dto.getUsePrice())) {
|
||||
throw new IllegalArgumentException("价格不能为空");
|
||||
|
|
@ -80,7 +80,9 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
|
|||
} catch (Exception e) {
|
||||
//调用食堂卡退款
|
||||
AjaxResult refundResultVo = refundOperation(bean);
|
||||
if (refundResultVo != null) return refundResultVo;
|
||||
if (refundResultVo != null) {
|
||||
return refundResultVo;
|
||||
}
|
||||
//删除当前订单
|
||||
int delCode = dao.deleteById(dto.getId());
|
||||
if (delCode == 0) {
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
|
|||
dto.setCreatedBy(SecurityUtils.getUsername());
|
||||
dto.setCreatedTime(new Date());
|
||||
dto.setUserId(String.valueOf(SecurityUtils.getUserId()));
|
||||
dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
|
||||
dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
|
||||
dto.setIsDeleted("0");
|
||||
List<DictDataInfoDO> equipmentTypeList = dictDataApi.getDictionaryInfo("time_slot");
|
||||
//拿到数据字典
|
||||
|
|
@ -124,7 +124,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
|
|||
|
||||
PaymentDto bean = new PaymentDto();
|
||||
bean.setMoney(dto.getProjectPrice());
|
||||
bean.setCustId(SecurityUtils.getLoginUser().getCustId());
|
||||
bean.setCustId(SecurityUtils.getUserId());
|
||||
|
||||
//调用食堂卡支付
|
||||
AjaxResult result = otherServiceClient.payMoneyForStage(bean);
|
||||
|
|
@ -135,7 +135,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
|
|||
|
||||
//新增订单信息 -- 出错调用退款
|
||||
dto.setOrderPayInfo(ajaxResultVo.getMsg());
|
||||
dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
|
||||
dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
|
||||
|
||||
AjaxResult insertOrderInfoResult = insertOrderInfo(dto, bean, ajaxResultVo);
|
||||
AjaxResultVo insertOrderInfoErrorVo = JSON.parseObject(JSON.toJSONString(insertOrderInfoResult), AjaxResultVo.class);
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ public class WashClothingOrderServiceImpl extends ServiceImpl<WashClothingOrderM
|
|||
greenOrder.setCreatedBy(userInfo.getLoginName());
|
||||
greenOrder.setCreatedTime(new Date());
|
||||
greenOrder.setUserId(userInfo.getUserId());
|
||||
greenOrder.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
|
||||
greenOrder.setCustId(String.valueOf(SecurityUtils.getUserId()));
|
||||
greenOrder.setIsDeleted("0");
|
||||
greenOrder.setOrderTime(new Date());
|
||||
//流水号
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 51189
|
||||
port: 48388
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
|
|||
Loading…
Reference in New Issue