clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-20 09:25:52 +08:00
parent a14f69f77c
commit 582d478186
2 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -677,6 +677,7 @@ public class OrderController extends BaseController {
.add(goodsStandard.getGoodsPrice().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getRetainRate()))));
}
}
// logger.info("一二三级平台节流扣点分别为【{}】【{}】【{}】【{}】[{}]",oneMoney,twoMoney,threeMoney,deptMoney,specialMoney);
// 平台扣除保险 --
deptMoney = deptMoney.add(insuranceMoney);

81
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -497,7 +497,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(completeAddress);
orderListResponse.setAddress(StringUtils.isNotEmpty(orderMaster.getAddress())?orderMaster.getAddress():completeAddress);
orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@ -516,6 +516,30 @@ public class OrderDetailController extends BaseController {
// TODO: 超时扣费
orderListResponse.setFinancialChangeRecords(financialChangeRecords);
orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
orderListResponse.setProvinceName(orderMaster.getProvinceName());
orderListResponse.setCityName(orderMaster.getCityName());
orderListResponse.setCountryName(orderMaster.getCountryName());
orderListResponse.setStreetName(orderMaster.getStreetName());
orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(orderMaster.getCityId());
orderListResponse.setCountryId(orderMaster.getCountryId());
orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setPhone(orderMaster.getPhone());
orderListResponse.setName(orderMaster.getName());
String addressSysArea = sysArea.getMergerName();
String[] array = addressSysArea.split(",");
if (org.apache.commons.lang3.StringUtils.isEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array[3]);
orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName());
}
if(orderMaster.getInsuranceId() != null){
InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
if(manager != null){
@ -716,7 +740,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(completeAddress);
orderListResponse.setAddress(StringUtils.isNotEmpty(orderMaster.getAddress())?orderMaster.getAddress():completeAddress);
orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@ -740,6 +764,32 @@ public class OrderDetailController extends BaseController {
orderListResponse.setArrivalTime(detail.getArrivalTime());
orderListResponse.setConsultMode(orderMaster.getConsultMode());
orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
orderListResponse.setProvinceName(orderMaster.getProvinceName());
orderListResponse.setCityName(orderMaster.getCityName());
orderListResponse.setCountryName(orderMaster.getCountryName());
orderListResponse.setStreetName(orderMaster.getStreetName());
orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(orderMaster.getCityId());
orderListResponse.setCountryId(orderMaster.getCountryId());
orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setPhone(orderMaster.getPhone());
orderListResponse.setName(orderMaster.getName());
String addressSysArea = sysArea.getMergerName();
String[] array = addressSysArea.split(",");
if (org.apache.commons.lang3.StringUtils.isEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array.length>3?array[3]:null);
orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName());
}
if(orderMaster.getInsuranceId() != null){
InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
if(manager != null){
@ -872,7 +922,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(completeAddress);
orderListResponse.setAddress(StringUtils.isNotEmpty(orderMaster.getAddress())?orderMaster.getAddress():completeAddress);
orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@ -886,6 +936,31 @@ public class OrderDetailController extends BaseController {
orderListResponse.setTimeout(detail.getTimeout());
orderListResponse.setAfterServiceRecordList(detailRecordMap.get(detail.getId()));
orderListResponse.setChangeMoney(changeMoney);
orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
orderListResponse.setProvinceName(orderMaster.getProvinceName());
orderListResponse.setCityName(orderMaster.getCityName());
orderListResponse.setCountryName(orderMaster.getCountryName());
orderListResponse.setStreetName(orderMaster.getStreetName());
orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(orderMaster.getCityId());
orderListResponse.setCountryId(orderMaster.getCountryId());
orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setPhone(orderMaster.getPhone());
orderListResponse.setName(orderMaster.getName());
String addressSysArea = sysArea.getMergerName();
String[] array = addressSysArea.split(",");
if (org.apache.commons.lang3.StringUtils.isEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array[3]);
orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName());
}
orderListResponses.add(orderListResponse);
});
return voDataTable(orderListResponses, list);