Merge remote-tracking branch 'origin/dev' into dev

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -366,7 +366,7 @@ public class HBOrderService implements IHBOrderService {
             createOrderRequest.setCaution(userByUserId.getUserMobile() + "*" + order.getRemarks());
         }
         if (order.getOrderType() != null && order.getOrderType() == 4) {
-            log.info("市民请结合：{}", bodyJson.getString("Order"));
+            log.info("市民请结合：{}",order);
             createOrderRequest.setRecipientName(order.getConsigneeName());
             createOrderRequest.setRecipientPhone(order.getConsigneeMobile());
             createOrderRequest.setRecipientLatitude(order.getLatitude());
@@ -528,4 +528,5 @@ public class HBOrderService implements IHBOrderService {
         log.info("海博查询系统订单详情返回数据:{}", JSONObject.toJSONString(createOrderRequest));
         return HBR.success(createOrderRequest);
     }
+
 }

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -121,6 +121,11 @@
         <result column="refund_status" jdbcType="INTEGER" property="refundStatus"/>
         <result column="order_type" jdbcType="INTEGER" property="orderType"/>
         <result column="close_type" jdbcType="INTEGER" property="closeType"/>
+        <result column="consignee_name" jdbcType="INTEGER" property="consigneeName"/>
+        <result column="consignee_mobile" jdbcType="INTEGER" property="consigneeMobile"/>
+        <result column="consignee_address" jdbcType="INTEGER" property="consigneeAddress"/>
+        <result column="latitude" jdbcType="INTEGER" property="latitude"/>
+        <result column="longitude" jdbcType="INTEGER" property="longitude"/>
         <collection property="orderItems" ofType="com.yami.shop.bean.model.OrderItem">
             <id column="order_item_id" jdbcType="BIGINT" property="orderItemId"/>
             <result column="shop_id" jdbcType="BIGINT" property="shopId"/>