Skip to content

C
cloud-platform
Commit 7765cc1e authored by 周健威's avatar 周健威
Browse files
Options

修复订单相关bug

parent 7462637a
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/account/OrderAccountDetail.java
View file @ 7765cc1e
...@@ -11,19 +11,19 @@ public class OrderAccountDetail { ...@@ -11,19 +11,19 @@ public class OrderAccountDetail {
/** /**
* 实际返回订单款 账单的的orderAmount 对应的是 订单的商品金额 * 实际返回订单款 账单的的orderAmount 对应的是 订单的商品金额
*/ */
BigDecimal orderAmount; BigDecimal orderAmount = BigDecimal.ZERO;
/** /**
* 实际返回押金款 * 实际返回押金款
*/ */
BigDecimal depositAmount; BigDecimal depositAmount = BigDecimal.ZERO;
/** /**
* 原来要返回的订单款 账单的的orderAmount 对应的是 订单的商品金额 * 原来要返回的订单款 账单的的orderAmount 对应的是 订单的商品金额
*/ */
BigDecimal originOrderAmount; BigDecimal originOrderAmount = BigDecimal.ZERO;
/** /**
* 原来要返回的押金款 * 原来要返回的押金款
*/ */
BigDecimal originDepositAmount; BigDecimal originDepositAmount = BigDecimal.ZERO;
/** /**
* 扣款列表 * 扣款列表
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
View file @ 7765cc1e
...@@ -188,7 +188,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -188,7 +188,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
refundGoodsAmount = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{ refundGoodsAmount = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
//ga : goodsAmount //ga : goodsAmount
set("ga", goodsAmount); set("ga", goodsAmount);
}})).toString()); }})+ "").toString());
refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ","); refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) { if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) {
orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT)); orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
View file @ 7765cc1e
...@@ -230,15 +230,15 @@ public class OrderMsgBiz { ...@@ -230,15 +230,15 @@ public class OrderMsgBiz {
//后台发送消息(客服) //后台发送消息(客服)
Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0); Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
smsParams.clear(); smsParams.clear();
sms2BgUser(cofig.getValue(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams); sms2BgUser(cofig.getValue(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
//后台发送消息(出车人) //后台发送消息(出车人)
smsParams.clear(); smsParams.clear();
sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_D, smsParams); sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_D, smsParams);
//后台发送消息(收车人) //后台发送消息(收车人)
smsParams.clear(); smsParams.clear();
sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams); sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams);
}else { }else {
log.error("通知短信异常，开始公司id 不存在或者为0 订单号：{}", baseOrder.getId()); log.error("通知短信异常，开始公司id 不存在或者为0 订单号：{}", baseOrder.getId());
...@@ -252,7 +252,7 @@ public class OrderMsgBiz { ...@@ -252,7 +252,7 @@ public class OrderMsgBiz {
//后台发送消息(客服) //后台发送消息(客服)
Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0); Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
smsParams.clear(); smsParams.clear();
sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_H, smsParams); sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_H, smsParams);
break; break;
case MEMBER: case MEMBER:
...@@ -316,7 +316,7 @@ public class OrderMsgBiz { ...@@ -316,7 +316,7 @@ public class OrderMsgBiz {
//后台发送消息(出车人) //后台发送消息(出车人)
smsParams.clear(); smsParams.clear();
sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_E, smsParams); sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_E, smsParams);
}else { }else {
log.error("通知后台客户短信异常，结束公司id 不存在或者为0 订单号：{}", baseOrder.getId()); log.error("通知后台客户短信异常，结束公司id 不存在或者为0 订单号：{}", baseOrder.getId());
} }
...@@ -327,7 +327,7 @@ public class OrderMsgBiz { ...@@ -327,7 +327,7 @@ public class OrderMsgBiz {
//后台发送消息(客服) //后台发送消息(客服)
Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0); Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
smsParams.clear(); smsParams.clear();
sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams); sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
break; break;
case MEMBER: case MEMBER:
break; break;
...@@ -442,8 +442,8 @@ public class OrderMsgBiz { ...@@ -442,8 +442,8 @@ public class OrderMsgBiz {
} }
private void sms2BgUser(String phone,BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) { private void sms2BgUser(String phone,BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, OrderTourDetail otd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
handelSmsParamBg(sCompany, eCompany, orvd, baseOrder, smsParams, appUserDTO, smstype); handelSmsParamBg(sCompany, eCompany, orvd, otd, baseOrder, smsParams, appUserDTO, smstype);
SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{ SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{
setPhoneNumbers(phone); setPhoneNumbers(phone);
setType(smstype); setType(smstype);
...@@ -586,7 +586,7 @@ public class OrderMsgBiz { ...@@ -586,7 +586,7 @@ public class OrderMsgBiz {
} }
} }
private void handelSmsParamBg(BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) { private void handelSmsParamBg(BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, OrderTourDetail otd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
if(null == eCompany) { if(null == eCompany) {
eCompany = new BranchCompany(); eCompany = new BranchCompany();
eCompany.setName(""); eCompany.setName("");
...@@ -638,7 +638,7 @@ public class OrderMsgBiz { ...@@ -638,7 +638,7 @@ public class OrderMsgBiz {
smsParams.add(baseOrder.getName()); smsParams.add(baseOrder.getName());
smsParams.add(sCompany.getName()); smsParams.add(sCompany.getName());
smsParams.add(sCompany.getTourServicePhone()); smsParams.add(sCompany.getTourServicePhone());
smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime()))); smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
break; break;
case SmsTemplateDTO.CANCEL_F : case SmsTemplateDTO.CANCEL_F :
smsParams.add(appUserDTO.getRealname()); smsParams.add(appUserDTO.getRealname());
...@@ -646,7 +646,7 @@ public class OrderMsgBiz { ...@@ -646,7 +646,7 @@ public class OrderMsgBiz {
smsParams.add(baseOrder.getName()); smsParams.add(baseOrder.getName());
smsParams.add(sCompany.getName()); smsParams.add(sCompany.getName());
smsParams.add(sCompany.getTourServicePhone()); smsParams.add(sCompany.getTourServicePhone());
smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime()))); smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
break; break;
default: default:
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment