Merge remote-tracking branch 'origin/master'

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java

@@ -348,5 +348,10 @@ public class Order implements Serializable {
     @TableField(exist = false)
     private List<Order> subOrders;
 
+    /**
+     * 自提核验码（明文码），长度不超过50
+     */
+    private String selfPickCode;
+
 
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/po/SMOrderPo.java

@@ -46,6 +46,12 @@ public class SMOrderPo implements Serializable {
      */
     private Double freightAmount;
 
+    /**
+     * 自提核验码（明文码），长度不超过50
+     */
+    private String selfPickCode;
+
+
     /**
      * 付款时间
      */

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

@@ -209,6 +209,9 @@ public class HBOrderService implements IHBOrderService {
         if (operatorType == 70 && order.getDvyType() == 3) {
             order.setHbOrderStatus(80);
         }
+        if (operatorType == 70 && order.getDvyType() == 2) {
+            order.setHbOrderStatus(80);
+        }
         orderMapper.updateById(order);
         if (isSmqjhOrder) {
             syncSmqjhOrderStatus(channelOrderId, order.getHbOrderStatus());
@@ -564,7 +567,7 @@ public class HBOrderService implements IHBOrderService {
         }
 
         createOrderRequest.setLogisticsType(dvyType);
-
+        createOrderRequest.setSelfPickCode(order.getSelfPickCode());
         OrderRiderLocation orderRiderLocation = orderRiderLocationMapper.selectOne(new LambdaQueryWrapper<OrderRiderLocation>().eq(OrderRiderLocation::getOrderNumber, order.getOrderNumber()));
         if (orderRiderLocation != null) {
             createOrderRequest.setCarrierNo(orderRiderLocation.getOrderNumber());//运单号，快递单号

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -2669,6 +2669,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         order.setHbOrderStatus(20);
         order.setHbLogisticStatus(0);
         order.setDvyType(orderPo.getDvyType());
+        order.setSelfPickCode(orderPo.getSelfPickCode());//设置自提码
         order.setFreightAmount(orderPo.getFreightAmount());
         order.setCreateTime(new Date());
         order.setUpdateTime(new Date());

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

@@ -131,6 +131,7 @@
         <result column="consignee_address" jdbcType="INTEGER" property="consigneeAddress"/>
         <result column="latitude" jdbcType="INTEGER" property="latitude"/>
         <result column="longitude" jdbcType="INTEGER" property="longitude"/>
+        <result column="self_pick_code" jdbcType="VARCHAR" property="selfPickCode"/>
         <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"/>