no message

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;

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());

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;
 }

ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java

@@ -117,4 +117,6 @@ public interface OrderMasterMapper {
     List<OrderMaster> searchByOrderStartTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     int updateCreateTime(Long id);
+
+    int updateOrderMasterAddressById(OrderMaster orderMaster);
 }

ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java

@@ -190,4 +190,6 @@ public interface OrderMasterService {
     // 订单主表数据统计返回 根据时间统计当前日期天
     OrderMasterStatisticsDTO orderStatisticsDisposeByNow();
 
+    int updateOrderMasterAddressById(OrderMaster orderMaster);
+
 }

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);
+    }
+
+
 }

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

@@ -39,6 +39,13 @@
         <result property="timeoutFineTimes"  column="timeout_fine_times"/>
         <result property="isCall" column="is_call" />
         <result property="serverMoney" column="server_money" />
+        <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="name"        column="name"/>
+        <result property="phone"        column="phone"/>
     </resultMap>
 
     <sql id="selectOrderMaster">
@@ -443,6 +450,13 @@
         <if test="expectTimeStart != null">expect_time_start,</if>
         <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="provinceId != null">province_id,</if>
+        <if test="cityId != null">city_id,</if>
+        <if test="countryId != null">country_id,</if>
+        <if test="streetId != null">street_id,</if>
+        <if test="address != null">address,</if>
+        <if test="name != null">name,</if>
+        <if test="phone != null">phone,</if>
         create_time
         )VALUES(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -467,6 +481,13 @@
         <if test="expectTimeStart != null">#{expectTimeStart},</if>
         <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="provinceId != null">#{provinceId},</if>
+        <if test="cityId != null">#{cityId},</if>
+        <if test="countryId != null">#{countryId},</if>
+        <if test="streetId != null">#{streetId},</if>
+        <if test="address != null">#{address},</if>
+        <if test="name != null">#{name},</if>
+        <if test="phone != null">#{phone},</if>
         SYSDATE()
         )
     </insert>
@@ -561,4 +582,10 @@
         </where>
     </select>
 
+    <update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
+        UPDATE order_master
+        SET timeout_ = #{timeout}
+        <if test="timeoutFineTimes != null">,timeout_fine_times = #{timeoutFineTimes}</if>
+        WHERE id = #{id}
+    </update>
 </mapper>