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-04-22 19:58:01 +08:00
parent b572d35b88
commit 7844f470fa
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,19 @@ public class OrderController extends BaseController {
orderMaster.setGoodsSpecification(request.getGoodsSpecification()); orderMaster.setGoodsSpecification(request.getGoodsSpecification());
orderMaster.setConsultMode(request.getConsultMode()); orderMaster.setConsultMode(request.getConsultMode());
orderMaster.setRemark(request.getRemark()); orderMaster.setRemark(request.getRemark());
orderMaster.setProvinceId(request.getProvinceId());
orderMaster.setCityId(request.getCityId());
orderMaster.setCountryId(request.getDistrictId());
orderMaster.setAddress(request.getFullAddress());
orderMaster.setPhone(customerAddress.getPhone());
orderMaster.setName(customerAddress.getName());
orderMaster.setProvinceName(customerAddress.getProvinceName());
orderMaster.setCityName(customerAddress.getCityName());
orderMaster.setCountryName(customerAddress.getCountryName());
orderMaster.setStreetId(request.getStreetId());
orderMaster.setStreetName(customerAddress.getStreetName());
if("01".equalsIgnoreCase(orderMaster.getConsultMode())){ if("01".equalsIgnoreCase(orderMaster.getConsultMode())){
orderMaster.setOrderMode("02"); orderMaster.setOrderMode("02");
orderMaster.setPayMode("01"); orderMaster.setPayMode("01");
@ -554,6 +567,11 @@ public class OrderController extends BaseController {
orderMaster.setAddress(customerAddress.getAddress()); orderMaster.setAddress(customerAddress.getAddress());
orderMaster.setName(customerAddress.getName()); orderMaster.setName(customerAddress.getName());
orderMaster.setPhone(customerAddress.getPhone()); orderMaster.setPhone(customerAddress.getPhone());
orderMaster.setProvinceName(customerAddress.getProvinceName());
orderMaster.setCityName(customerAddress.getCityName());
orderMaster.setCountryName(customerAddress.getCountryName());
orderMaster.setStreetId(request.getStreetId());
orderMaster.setStreetName(customerAddress.getStreetName());
// TODO 优惠金额不知道咋算 暂时先给0 // TODO 优惠金额不知道咋算 暂时先给0

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

@ -624,7 +624,11 @@ public class OrderMasterController extends BaseController {
orderMaster.setAddress(request.getFullAddress()); orderMaster.setAddress(request.getFullAddress());
orderMaster.setPhone(customerAddress.getPhone()); orderMaster.setPhone(customerAddress.getPhone());
orderMaster.setName(customerAddress.getName()); orderMaster.setName(customerAddress.getName());
orderMaster.setProvinceName(customerAddress.getProvinceName());
orderMaster.setCityName(customerAddress.getCityName());
orderMaster.setCountryName(customerAddress.getCountryName());
orderMaster.setStreetId(request.getStreetId());
orderMaster.setStreetName(customerAddress.getStreetName());
// 存在登陆用户的情况下 // 存在登陆用户的情况下
if(getSysUser() != null){ if(getSysUser() != null){

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -766,6 +766,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
@Override @Override
public int updateOrderMasterAddressById(OrderMaster orderMaster) { public int updateOrderMasterAddressById(OrderMaster orderMaster) {
logger.info("传入的更新订单地址对应的数据{}",orderMaster);
return orderMasterMapper.updateOrderMasterAddressById(orderMaster); return orderMasterMapper.updateOrderMasterAddressById(orderMaster);
} }