配送售后退货退款海博库存没加回去处理

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

@@ -73,8 +73,6 @@ public class OrderRefundController {
 
     private final MapperFacade mapperFacade;
 
-    private final Snowflake snowflake;
-
     private final OrderItemService orderItemService;
 
     private final RefundDeliveryService refundDeliveryService;

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

@@ -49,6 +49,7 @@ public class RefundAppointmentController {
         orderRefund.setReturnMoneySts(ReturnMoneyStsType.RECEIVE.value());
         orderRefund.setShipTime(new Date());
         orderRefund.setUpdateTime(new Date());
+        orderRefund.setIsReturnLogistics(true);
         orderRefundService.updateById(orderRefund);
 
         OrderRefundRecord orderRefundRecord = new OrderRefundRecord();

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

@@ -163,6 +163,11 @@ public class Order implements Serializable {
     private Date finallyTime;
 
 
+    /**
+     * 订单取消原因
+     */
+    private String cancelReason;
+
     /**
      * 取消时间
      */

yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java

@@ -33,9 +33,13 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<Order> listUnRefundOrderAndOrderItems(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
     List<Order> selectCancelOrders(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
 
-    void cancelOrders(@Param("orders") List<Order> orders);
+    /**
+     * 定时任务取消订单
+     * @param orders
+     */
+    void cancelOrders(@Param("orders") List<Order> orders, @Param("cancelReason") String cancelReason);
 
-    void receiptOrder(@Param("orders") List<Order> orders);
+//    void receiptOrder(@Param("orders") List<Order> orders);
 
     void updateByToPaySuccess(@Param("orderNumbers") List<String> orderNumbers, @Param("payType") Integer payType);
 

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

@@ -1175,6 +1175,12 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
             orderRefundMapper.updateById(orderRefund);
 
+
+            //订单退款金额或者积分处理
+            orderService.returnRefund(orderRefund.getOrderNumber());
+
+            //推送商家审核状态后 同步退款单状态
+            changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
             //生成待商家审核记录
             addOrderRefundRecord(orderRefund.getRefundId(), 7, 5, "商家收到商品井确认不影响二次销售后，将会为您处理退款");
         } catch (Exception e) {

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

@@ -265,7 +265,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }
-        orderMapper.cancelOrders(orders);
+        orderMapper.cancelOrders(orders,"未按时支付");
         List<OrderItem> allOrderItems = new ArrayList<>();
         for (Order order : orders) {
             List<OrderItem> orderItems = order.getOrderItems();
@@ -316,7 +316,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void receiptOrder(List<Order> orders) {
-        orderMapper.receiptOrder(orders);
+        orderMapper.cancelOrders(orders,"用户主动取消");
         for (Order order : orders) {
             eventPublisher.publishEvent(new ReceiptOrderEvent(order));
         }

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

@@ -236,7 +236,7 @@
   </select>
 
     <update id="cancelOrders">
-        update tz_order set `hb_order_status`=60,close_type = 1, cancel_time = NOW(),update_time=NOW(),close_type=4  where order_id in
+        update tz_order set `hb_order_status`=60,close_type = 1,cancel_reason = #{cancelReason}, cancel_time = NOW(),update_time=NOW(),close_type=4  where order_id in
         <foreach collection="orders" item="order" open="(" close=")" separator=",">
             #{order.orderId}
         </foreach>

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

@@ -518,7 +518,7 @@
         where refund.refund_id = #{refundId}
     </select>
     <select id="findByOrderNumber" resultType="com.yami.shop.bean.model.OrderRefund">
-        select * from tz_order_refund where return_money_sts=#{returnMoneySts} and order_number =#{orderNumber}
+        select * from tz_order_refund where return_money_sts=#{returnMoneySts} and order_number =#{orderNumber} and handler =0
     </select>
 
 </mapper>