From 0c6ced5f6435754dfe93b1bf81ffa854c1ba5740 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Tue, 22 Apr 2025 17:58:54 +0800 Subject: [PATCH] no message --- .../web/controller/order/OrderController.java | 10 +++++++ .../order/OrderMasterController.java | 10 +++++++ .../com/ghy/order/domain/OrderMaster.java | 9 +++++++ .../ghy/order/mapper/OrderMasterMapper.java | 2 ++ .../ghy/order/service/OrderMasterService.java | 2 ++ .../service/impl/OrderMasterServiceImpl.java | 7 +++++ .../mapper/order/OrderMasterMapper.xml | 27 +++++++++++++++++++ 7 files changed, 67 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index ac504e49..a7b0bf8d 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -545,6 +545,16 @@ public class OrderController extends BaseController { orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); orderMaster.setInsuranceId(appOrderRequest.getInsuranceId()); + //处理新增订单的地址 + CustomerAddress customerAddress=customerAddressService.selectByCustomerAddressId(appOrderRequest.getAddressId()); + orderMaster.setProvinceId(customerAddress.getProvinceId()); + orderMaster.setCityId(customerAddress.getCityId()); + orderMaster.setCountryId(customerAddress.getCountryId()); + orderMaster.setStreetId(customerAddress.getStreetId()); + orderMaster.setAddress(customerAddress.getAddress()); + orderMaster.setName(customerAddress.getName()); + orderMaster.setPhone(customerAddress.getPhone()); + // TODO 优惠金额不知道咋算 暂时先给0 BigDecimal discountMoney = BigDecimal.ZERO; diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index f3b916c5..68ea1394 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -616,6 +616,16 @@ public class OrderMasterController extends BaseController { orderMaster.setPayMode(request.getPayMode()); orderMaster.setGoodsBrand(request.getGoodsBrand()); orderMaster.setGoodsSpecification(request.getGoodsSpecification()); + + //在订单表保存地址信息 + orderMaster.setProvinceId(request.getProvinceId()); + orderMaster.setCityId(request.getCityId()); + orderMaster.setCountryId(request.getDistrictId()); + orderMaster.setAddress(request.getFullAddress()); + orderMaster.setPhone(customerAddress.getPhone()); + orderMaster.setName(customerAddress.getName()); + + // 存在登陆用户的情况下 if(getSysUser() != null){ orderMaster.setCreateBy(getSysUser().getUserId().toString()); diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index cb2dde3c..13878274 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -218,4 +218,13 @@ public class OrderMaster extends BaseEntity { private Long insuranceId; + private Long cityId; + + /*街道id*/ + private Long streetId; + + private Long provinceId; + + private String name; + private String phone; } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java index 0e925227..8fc26566 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java @@ -117,4 +117,6 @@ public interface OrderMasterMapper { List searchByOrderStartTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime); int updateCreateTime(Long id); + + int updateOrderMasterAddressById(OrderMaster orderMaster); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index a491d4dc..b2bce175 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -190,4 +190,6 @@ public interface OrderMasterService { // 订单主表数据统计返回 根据时间统计当前日期天 OrderMasterStatisticsDTO orderStatisticsDisposeByNow(); + int updateOrderMasterAddressById(OrderMaster orderMaster); + } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 24a46c8b..7db3c43b 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -763,4 +763,11 @@ public class OrderMasterServiceImpl implements OrderMasterService { } return statisticsDTO; } + + @Override + public int updateOrderMasterAddressById(OrderMaster orderMaster) { + return orderMasterMapper.updateOrderMasterAddressById(orderMaster); + } + + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 4d0caeb9..1b8e7fc1 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -39,6 +39,13 @@ + + + + + + + @@ -443,6 +450,13 @@ expect_time_start, expect_time_end, create_by, + province_id, + city_id, + country_id, + street_id, + address, + name, + phone, create_time )VALUES( #{deptId}, @@ -467,6 +481,13 @@ #{expectTimeStart}, #{expectTimeEnd}, #{createBy}, + #{provinceId}, + #{cityId}, + #{countryId}, + #{streetId}, + #{address}, + #{name}, + #{phone}, SYSDATE() ) @@ -561,4 +582,10 @@ + + UPDATE order_master + SET timeout_ = #{timeout} + ,timeout_fine_times = #{timeoutFineTimes} + WHERE id = #{id} +