add deliver

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -270,8 +270,11 @@ public class OrderRefundController {
     public ResponseEntity<String> apply(@Valid @RequestBody OrderRefundParam orderRefundParam) {
         log.info("小程序申请退款参数:{}", JSONObject.toJSONString(orderRefundParam));
         List<OrderRefundSku> orderRefundSkuList = orderRefundParam.getOrderRefundSkuList();
+        System.out.println("orderRefundSkuList-------"+orderRefundSkuList);
         CullenUtils.validateDataThrowException(orderRefundSkuList.isEmpty(), "退款商品不能为空...");
+        System.out.println("过-------");
         String userId = SecurityUtils.getUser().getUserId();
+        System.out.println("userId-------"+userId);
 //        String userId = "36726893042d492aba446439c5f00584";
         // 获取订单信息
         Order order = orderService.getOrderByOrderNumberAndUserId(orderRefundParam.getOrderNumber(), userId, true);

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

@@ -220,7 +220,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         // 提交订单
         eventPublisher.publishEvent(new SubmitOrderEvent(mergerOrder, orderList));
         // 插入订单
-        orderList.forEach(orderMapper::insert);
+        orderList.forEach(c->{
+            if (c.getDvyType().equals(1)){
+                c.setHbOrderStatus(1);
+            }
+            orderMapper.insert(c);
+        });
         List<OrderItem> orderItems = orderList.stream()
                 .flatMap(order -> order.getOrderItems().stream()
                 )

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

@@ -518,7 +518,7 @@
         LEFT JOIN tz_user_addr_order b on a.addr_order_id=b.addr_order_id
         LEFT JOIN tz_shop_detail c on a.shop_id=c.shop_id
         <where>
-            a.dvy_type=3
+            a.dvy_type=1
             <if test="orderParam.orderNumber != null and orderParam.orderNumber != ''">
                 and a.order_number = #{orderParam.orderNumber}
             </if>
@@ -960,7 +960,7 @@
     </select>
 
     <select id="statusCount" resultType="integer">
-        SELECT count(1) FROM `tz_order` WHERE hb_order_status in
+        SELECT count(1) FROM `tz_order` WHERE  dvy_type=1 and hb_order_status in
         <foreach collection="status" item="status" separator="," open="(" close=")">
             #{status}
         </foreach>