合约订单标签，四级地址

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

@@ -199,20 +199,17 @@ public class OrderController extends BaseController {
         if (request.getProvinceId() == null || request.getCityId() == null || request.getDistrictId() == null || StringUtils.isBlank(request.getFullAddress())) {
             return AjaxResult.error("请填写地址");
         }
-        CustomerAddress customerAddress = customerAddressService.selectByCustomerAndAddress(customer.getCustomerId(),
+        CustomerAddress customerAddress = new CustomerAddress();
-                request.getProvinceId(), request.getCityId(), request.getDistrictId(), request.getFullAddress());
+        customerAddress.setCustomerId(customer.getCustomerId());
-        if (customerAddress == null) {
+        customerAddress.setProvinceId(request.getProvinceId());
-            customerAddress = new CustomerAddress();
+        customerAddress.setCityId(request.getCityId());
-            customerAddress.setCustomerId(customer.getCustomerId());
+        customerAddress.setCountryId(request.getDistrictId());
-            customerAddress.setProvinceId(request.getProvinceId());
+        customerAddress.setAddress(request.getFullAddress());
-            customerAddress.setCityId(request.getCityId());
+        customerAddress.setStreetId(request.getStreetId());
-            customerAddress.setCountryId(request.getDistrictId());
+        customerAddress.setIsDefault(0);
-            customerAddress.setAddress(request.getFullAddress());
+        customerAddress.setPhone(request.getCustomerPhone());
-            customerAddress.setIsDefault(0);
+        customerAddress.setName(request.getCustomerName());
-            customerAddress.setPhone(request.getCustomerPhone());
+        customerAddressService.insertCustomerAddress(customerAddress);
-            customerAddress.setName(request.getCustomerName());
-            customerAddressService.insertCustomerAddress(customerAddress);
-        }
 
         // 订单总价 不能小于0
         BigDecimal orderPrice = request.getPrice().max(BigDecimal.ZERO);
@@ -1158,7 +1155,12 @@ public class OrderController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             // 查询售后记录
@@ -1275,7 +1277,12 @@ public class OrderController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {
@@ -1397,7 +1404,12 @@ public class OrderController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             // 查询售后记录
@@ -1451,6 +1463,7 @@ public class OrderController extends BaseController {
             orderListResponse.setCreateTime(master.getCreateTime());
             orderListResponse.setUpdateTime(master.getUpdateTime());
             orderListResponse.setIsCall(master.getIsCall());
+            orderListResponse.setConsultMode(master.getConsultMode());
             orderListResponses.add(orderListResponse);
 
         }
@@ -1489,7 +1502,12 @@ public class OrderController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {
@@ -1555,6 +1573,7 @@ public class OrderController extends BaseController {
             orderListResponse.setChangeMoney(changeMoney);
             orderListResponse.setCreateTime(detail.getCreateTime());
             orderListResponse.setUpdateTime(detail.getUpdateTime());
+            orderListResponse.setConsultMode(orderMaster.getConsultMode());
 //            orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
             orderListResponses.add(orderListResponse);
         }

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

@@ -231,7 +231,12 @@ public class OrderDetailController extends BaseController {
                 // 地址信息
                 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
                 if (customerAddress != null) {
-                    SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+                    SysArea sysArea;
+                    if(customerAddress.getStreetId()!=null){
+                        sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+                    }else {
+                        sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+                    }
                     String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
                     detail.setAddressName(customerAddress.getName());
                     detail.setAddressPhone(customerAddress.getPhone());
@@ -347,7 +352,12 @@ public class OrderDetailController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             // 完工图片
@@ -545,7 +555,12 @@ public class OrderDetailController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {
@@ -692,7 +707,12 @@ public class OrderDetailController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {

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

@@ -674,7 +674,12 @@ public class OrderMasterController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             // 查询售后记录
@@ -830,7 +835,12 @@ public class OrderMasterController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {
@@ -1067,7 +1077,12 @@ public class OrderMasterController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
-            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            SysArea sysArea;
+            if(customerAddress.getStreetId()!=null){
+                sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+            }else {
+                sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            }
             String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for (OrderGoods orderGoods : orderStandardList) {
@@ -1221,7 +1236,13 @@ public class OrderMasterController extends BaseController {
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
             if (customerAddress != null) {
-                SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+                SysArea sysArea;
+                if(customerAddress.getStreetId() != null){
+                    sysArea = sysAreaService.selectById(customerAddress.getStreetId());
+                }else {
+                    sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+                }
+
                 String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
                 master.setAddressName(customerAddress.getName());
                 master.setAddressPhone(customerAddress.getPhone());

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -164,5 +164,8 @@ public class OrderListResponse {
 
     private String orderMode;
 
+    /*是否合约订单*/
+    private String consultMode;
+
     private Goods goods;
 }

ghy-admin/src/main/resources/templates/login.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>追风者</title>
+    <title>工盟互联</title>
     <meta name="description" content="后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ghy-custom/src/main/java/com/ghy/customer/domain/CustomerAddress.java

@@ -36,12 +36,17 @@ public class CustomerAddress extends BaseEntity {
 
     private String countryName;
 
+    private String streetName;
+
     @Excel(name = "市", cellType = Excel.ColumnType.NUMERIC)
     private Long cityId;
 
     @Excel(name = "区", cellType = Excel.ColumnType.NUMERIC)
     private Long countryId;
 
+    /*街道id*/
+    private Long streetId;
+
     @Excel(name = "详细地址")
     private String address;
 

ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerAddressServiceImpl.java

@@ -30,6 +30,9 @@ public class CustomerAddressServiceImpl implements CustomerAddressService {
             address.setCountryName(iSysAreaService.selectById(address.getCountryId()).getAreaName());
             address.setCityName(iSysAreaService.selectById(address.getCityId()).getAreaName());
             address.setProvinceName(iSysAreaService.selectById(address.getProvinceId()).getAreaName());
+            if(address.getStreetId()!=null){
+                address.setStreetName(iSysAreaService.selectById(address.getStreetId()).getAreaName());
+            }
         }
         return addressList;
     }

ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml

@@ -10,6 +10,7 @@
         <result property="provinceId"          column="province_id"/>
         <result property="cityId"          column="city_id"/>
         <result property="countryId"          column="country_id"/>
+        <result property="streetId"          column="street_id"/>
         <result property="address"          column="address"/>
         <result property="status"              column="status"     />
         <result property="isDefault"              column="is_default"     />
@@ -21,7 +22,7 @@
     </resultMap>
 
     <sql id="selectCustomerAddress">
-        SELECT customer_address_id, customer_id, name, phone, province_id, city_id, country_id, status,
+        SELECT customer_address_id, customer_id, name, phone, province_id, city_id, country_id, street_id, status,
                address, create_by, create_time, remark, is_default
         FROM customer_address
     </sql>
@@ -97,6 +98,7 @@
         <if test="provinceId != null and provinceId != 0">province_id,</if>
         <if test="cityId != null and cityId != 0">city_id,</if>
         <if test="countryId != null and countryId != 0">country_id,</if>
+        <if test="streetId != null and streetId != 0">street_id,</if>
         <if test="status != null and status != ''">status,</if>
         <if test="address != null and address != ''">address,</if>
         <if test="isDefault != null">is_default,</if>
@@ -111,6 +113,7 @@
         <if test="provinceId != null and provinceId != 0">#{provinceId},</if>
         <if test="cityId != null and cityId != 0">#{cityId},</if>
         <if test="countryId != null and countryId != 0">#{countryId},</if>
+        <if test="streetId != null and streetId != 0">#{streetId},</if>
         <if test="status != null">#{status},</if>
         <if test="address != null and address != ''">#{address},</if>
         <if test="isDefault != null">#{isDefault},</if>
@@ -129,6 +132,7 @@
             <if test="provinceId != null and provinceId != 0">province_id = #{provinceId},</if>
             <if test="cityId != null and cityId != 0">city_id = #{cityId},</if>
             <if test="countryId != null and countryId != 0">country_id = #{countryId},</if>
+            <if test="streetId != null and streetId != 0">street_id = #{streetId},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="isDefault != null">is_default = #{isDefault},</if>
             <if test="status != null and status != ''">status = #{status},</if>

ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java

@@ -37,6 +37,8 @@ public class SysOrderAssignRequest {
 
     private Long districtId;
 
+    private Long streetId;
+
     // 详细地址
     private String fullAddress;
 

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -13,6 +13,7 @@
         <result property="orderType"         column="order_type"/>
         <result property="orderMode"         column="order_mode"/>
         <result property="payMode"         column="pay_mode"/>
+        <result property="consultMode"  column="consult_mode"/>
         <result property="isCharge"         column="is_charge"/>
         <result property="isContact"         column="is_contact"/>
         <result property="orderStatus"       column="order_status"/>
@@ -48,6 +49,7 @@
                order_type,
                order_mode,
                pay_mode,
+               consult_mode,
                is_charge,
                is_contact,
                order_status,
@@ -420,6 +422,7 @@
         <if test="orderType != null">order_type,</if>
         <if test="orderMode != null">order_mode,</if>
         <if test="payMode != null">pay_mode,</if>
+        <if test="consultMode != null">consult_mode,</if>
         <if test="orderStatus != null">order_status,</if>
         <if test="payType != null">pay_type,</if>
         <if test="payStatus != null">pay_status,</if>
@@ -442,6 +445,7 @@
         <if test="orderType != null">#{orderType},</if>
         <if test="orderMode != null">#{orderMode},</if>
         <if test="payMode != null">#{payMode},</if>
+        <if test="consultMode != null">#{consultMode},</if>
         <if test="orderStatus != null">#{orderStatus},</if>
         <if test="payType != null">#{payType},</if>
         <if test="payStatus != null">#{payStatus},</if>