分类绑定商品处理

yami-shop-platform/src/main/java/com/yami/shop/platform/task/OrderTask.java

@@ -70,15 +70,19 @@ public class OrderTask {
         Date now = new Date();
         logger.info("取消超时未支付订单。。。");
         // 获取15分钟之前未支付的订单
-        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
+        List<Order> orders = orderService.cancelOrders(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }
 
         List<Order>  cancelOrderList = this.chackOrders(orders);
-        orderService.cancelOrders(cancelOrderList);
+
+
+        //TODO zx定时任务加回积分待完善
+//        orderService.cancelOrders(orders);
+
         // 移除缓存
-        this.removeCache(cancelOrderList);
+        this.removeCache(orders);
 
     }
 
@@ -89,7 +93,7 @@ public class OrderTask {
         Date now = new Date();
         logger.info("系统自动确认收货订单。。。");
         // 获取10天之前等待确认收货的订单
-        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.CONSIGNMENT.value(),DateUtil.offsetDay(now, -10));
+        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.RECEIVED.value(),DateUtil.offsetDay(now, -10));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }

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

@@ -31,6 +31,7 @@ public interface OrderMapper extends BaseMapper<Order> {
     Order getOrderByOrderNumber(@Param("orderNumber") String orderNumber);
 
     List<Order> listUnRefundOrderAndOrderItems(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
+    List<Order> cancelOrders(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
 
     void cancelOrders(@Param("orders") List<Order> orders);
 

yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java

@@ -82,8 +82,20 @@ public interface OrderService extends IService<Order> {
 
     void delivery(Order order);
 
+    /**
+     * 获取送达的订单项
+     * @param orderStatus 订单状态
+     * @param lessThanUpdateTime 时间
+     * @return
+     */
     List<Order> listUnRefundOrderAndOrderItems(Integer orderStatus, DateTime lessThanUpdateTime);
 
+    /**
+     * @param orderStatus 订单状态
+     * @param lessThanUpdateTime 时间
+     */
+    List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime);
+
     void cancelOrders(List<Order> orders);
 
     void receiptOrder(List<Order> orders);

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

@@ -10,6 +10,8 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.dao.CategoryProdMapper;
 import com.yami.shop.service.CategoryProdService;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import java.util.List;
  * Created by lgh on 2018/07/13.
  */
 @Service
+@Slf4j
 public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, CategoryProd> implements CategoryProdService {
 
     @Autowired
@@ -62,6 +65,7 @@ public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, Cat
                     .eq(CategoryProd::getCode, categoryProductDTO.getParentCode())
                     .eq(CategoryProd::getShopId, categoryProductDTO.getShopId())
                     .eq(CategoryProd::getIsDelete, 0));
+            log.info("查看父类绑定商品是否存在不存在添加:{}", integer1);
             if (integer1 == 0) {
                 CategoryProd categoryProdParent = new CategoryProd();
                 categoryProdParent.setCategoryId(categoryProductDTO.getCategoryId());

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

@@ -254,6 +254,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public List<Order> listUnRefundOrderAndOrderItems(Integer orderStatus, DateTime lessThanUpdateTime) {
         return orderMapper.listUnRefundOrderAndOrderItems(orderStatus, lessThanUpdateTime);
     }
+    @Override
+    public List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime) {
+        return orderMapper.cancelOrders(orderStatus, lessThanUpdateTime);
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -229,6 +229,12 @@
     and o.dvy_time < #{lessThanUpdateTime}
   </select>
 
+    <select id="cancelOrders" resultMap="orderAndOrderItemMap">
+    select o.*,oi.*,oi.prod_name oi_prod_name,oi.actual_total as oi_actual_total from tz_order o
+      join tz_order_item oi on o.order_number = oi.order_number
+    where o.hb_order_status = #{orderStatus}  and o.create_time &lt; #{lessThanUpdateTime}
+  </select>
+
     <update id="cancelOrders">
         update tz_order set `hb_order_status`=60,cancel_time = NOW(),update_time=NOW(),close_type=4  where order_id in
         <foreach collection="orders" item="order" open="(" close=")" separator=",">