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-09 09:49:20 +08:00
parent a22d60f23a
commit c857e551fb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1228,7 +1228,15 @@ public class OrderMasterController extends BaseController {
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+workerRealInfo.getName();
} }
String masterWorkerName = "";
String masterCompanyName = "";
Worker masterWorker = workerService.selectById(orderMaster.getWorkerId());
if (masterWorker != null) {
// 大师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
masterWorkerName = workerRealInfo == null ? masterWorker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName();
}
// 消费者信息 // 消费者信息
// Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId()); // Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId());
@ -1338,6 +1346,9 @@ public class OrderMasterController extends BaseController {
orderListResponse.setGoodsAreaList(goods.getGoodsAreaList()); orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
orderListResponse.setOrderMode(orderMaster.getOrderMode()); orderListResponse.setOrderMode(orderMaster.getOrderMode());
orderListResponse.setIsCall(orderMaster.getIsCall()); orderListResponse.setIsCall(orderMaster.getIsCall());
orderListResponse.setMasterCompanyName(masterCompanyName);
orderListResponse.setMasterWorkerPhone(masterWorker == null ? "" : masterWorker.getPhone());
orderListResponse.setMasterWorkerName(masterWorkerName);
logger.info("主单id{}，主单数据{},省名字{},街道id{},是否有值{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId(),StringUtils.isNotEmpty(orderMaster.getProvinceName())); logger.info("主单id{}，主单数据{},省名字{},街道id{},是否有值{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId(),StringUtils.isNotEmpty(orderMaster.getProvinceName()));
if (StringUtils.isNotEmpty(orderMaster.getProvinceName())){ if (StringUtils.isNotEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceId(orderMaster.getProvinceId()); orderListResponse.setProvinceId(orderMaster.getProvinceId());

6
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -669,7 +669,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
fdUpdate.setPayMoney(payMoney); fdUpdate.setPayMoney(payMoney);
divMembers.add(new DivMember("0", MoneyUtil.toS(commissionAmount), true)); divMembers.add(new DivMember("0", MoneyUtil.toS(commissionAmount), true));
financialDetailService.updateFinancialDetail(fdUpdate); int financialDetailUpdate= financialDetailService.updateFinancialDetail(fdUpdate);
odMoney = odMoney.add(commissionAmount); odMoney = odMoney.add(commissionAmount);
// 增加手续费财务子单 // 增加手续费财务子单
FinancialDetail financialDetail1 = new FinancialDetail(); FinancialDetail financialDetail1 = new FinancialDetail();
@ -677,8 +677,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
financialDetail1.setFinancialDetailType(2); financialDetail1.setFinancialDetailType(2);
financialDetail1.setPayMoney(commissionAmount); financialDetail1.setPayMoney(commissionAmount);
financialDetail1.setPayTime(new Date()); financialDetail1.setPayTime(new Date());
financialDetailService.insertFinancialDetail(financialDetail1); int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1);
logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},增加的财务子单{}子单金额{}", payMoney, commissionAmount, financialDetail1,odMoney); logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert);
} }
logger.info("子单的罚金处理后的总额{}", dtx); logger.info("子单的罚金处理后的总额{}", dtx);