分类绑定商品处理

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

@@ -3,8 +3,12 @@ package com.yami.shop.bean.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -94,6 +98,13 @@ public class ShopCategory implements Serializable {
      * 标签
      */
     private Long label;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recTime;
+
     /**
      * 标签名称
      */

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

@@ -70,16 +70,16 @@ public class OrderTask {
         Date now = new Date();
         logger.info("取消超时未支付订单。。。");
         // 获取15分钟之前未支付的订单
-        List<Order> orders = orderService.cancelOrders(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
+        List<Order> orders = orderService.selectCancelOrders(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }
 
-        List<Order>  cancelOrderList = this.chackOrders(orders);
+//        List<Order>  cancelOrderList = this.chackOrders(orders);
 
 
         //TODO zx定时任务加回积分待完善
-//        orderService.cancelOrders(orders);
+        orderService.cancelOrders(orders);
 
         // 移除缓存
         this.removeCache(orders);

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

@@ -31,7 +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);
+    List<Order> selectCancelOrders(@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

@@ -94,7 +94,7 @@ public interface OrderService extends IService<Order> {
      * @param orderStatus 订单状态
      * @param lessThanUpdateTime 时间
      */
-    List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime);
+    List<Order> selectCancelOrders(Integer orderStatus, DateTime lessThanUpdateTime);
 
     void cancelOrders(List<Order> orders);
 

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

@@ -159,6 +159,8 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
         shopCategory.setIsLeaves(frontCategory.getIsLeaves());
 
         shopCategoryMapper.insert(shopCategory);
+
+
     }
 
     @Override

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

@@ -198,7 +198,7 @@ public class HBGoodsService implements IHBGoodsService {
                 for (CategoryProdHb categoryProd : categoryProds) {
                     FrontCategory frontCategory = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>()
                             .eq(FrontCategory::getCode, categoryProd.getCode()));
-                    addShopCategory(frontCategory, categoryProd.getProdId(),shopDetail.getShopId(), shopDetail.getHbStationId());
+                    addShopCategory(frontCategory, categoryProd.getProdId(), shopDetail.getShopId(), shopDetail.getHbStationId());
                 }
 
 
@@ -219,74 +219,91 @@ public class HBGoodsService implements IHBGoodsService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public void addShopCategory(FrontCategory frontCategory,Long prodId, Long shopId, String hbShopId) {
+    public void addShopCategory(FrontCategory frontCategory, Long prodId, Long shopId, String hbShopId) {
+        log.info("添加门店分类：{}", frontCategory);
         ShopCategory shopCategoryByCode = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
                 .eq(ShopCategory::getCode, frontCategory.getCode())
                 .eq(ShopCategory::getShopId, shopId)
                 .eq(ShopCategory::getIsDelete, 0));
 
-        if (shopCategoryByCode != null) {
-            log.info("门店分类已存在，无需添加");
-            return;
-        }
-        ShopCategory shopCategory = new ShopCategory();
-        shopCategory.setCode(frontCategory.getCode());
-        shopCategory.setName(frontCategory.getName());
-        if (frontCategory.getParentCode() == null || frontCategory.getParentCode().equals("0")) {
-            shopCategory.setPid(0L);
-            shopCategory.setParentCode("0");
-        } else {
-            ShopCategory shopCategoryByCode1 = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
-                    .eq(ShopCategory::getCode, frontCategory.getParentCode())
-                    .eq(ShopCategory::getShopId, shopId)
-                    .eq(ShopCategory::getIsDelete, 0));
-            if (shopCategoryByCode1 == null) {
-                //不存在门店分类父类目添加
-                FrontCategory frontCategoryParent = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>()
-                        .eq(FrontCategory::getCode, frontCategory.getParentCode())
-                        .eq(FrontCategory::getIsDelete, 0));
-                addShopCategory(frontCategoryParent,prodId, shopId, hbShopId);
-
-                shopCategoryByCode1 = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
+        if (shopCategoryByCode == null) {
+            ShopCategory shopCategory = new ShopCategory();
+            shopCategory.setCode(frontCategory.getCode());
+            shopCategory.setName(frontCategory.getName());
+            if (frontCategory.getParentCode() == null || frontCategory.getParentCode().equals("0")) {
+                shopCategory.setPid(0L);
+                shopCategory.setParentCode("0");
+            } else {
+                ShopCategory shopCategoryByCode1 = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
                         .eq(ShopCategory::getCode, frontCategory.getParentCode())
                         .eq(ShopCategory::getShopId, shopId)
                         .eq(ShopCategory::getIsDelete, 0));
+                if (shopCategoryByCode1 == null) {
+                    //不存在门店分类父类目添加
+                    FrontCategory frontCategoryParent = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>()
+                            .eq(FrontCategory::getCode, frontCategory.getParentCode())
+                            .eq(FrontCategory::getIsDelete, 0));
+                    addShopCategory(frontCategoryParent, prodId, shopId, hbShopId);
+
+                    shopCategoryByCode1 = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
+                            .eq(ShopCategory::getCode, frontCategory.getParentCode())
+                            .eq(ShopCategory::getShopId, shopId)
+                            .eq(ShopCategory::getIsDelete, 0));
+                }
+                shopCategory.setPid(shopCategoryByCode1.getId());
+                shopCategory.setParentCode(shopCategoryByCode1.getCode());
             }
-            shopCategory.setPid(shopCategoryByCode1.getId());
-            shopCategory.setParentCode(shopCategoryByCode1.getCode());
-        }
-
-        shopCategory.setShopId(shopId);
-        shopCategory.setHbShopId(hbShopId);
-        shopCategory.setLabel(frontCategory.getLabel());
-        shopCategory.setIcon(frontCategory.getIcon());
-        shopCategory.setPic(frontCategory.getPic());
-        shopCategory.setLevel(frontCategory.getLevel());
-        shopCategory.setIsDelete(0);
-        shopCategory.setOperateUser("admin");
-        shopCategory.setNum(frontCategory.getNum());
-        shopCategory.setIsLeaves(frontCategory.getIsLeaves());
 
-        shopCategoryMapper.insert(shopCategory);
+            shopCategory.setShopId(shopId);
+            shopCategory.setHbShopId(hbShopId);
+            shopCategory.setLabel(frontCategory.getLabel());
+            shopCategory.setIcon(frontCategory.getIcon());
+            shopCategory.setPic(frontCategory.getPic());
+            shopCategory.setLevel(frontCategory.getLevel());
+            shopCategory.setIsDelete(0);
+            shopCategory.setOperateUser("admin");
+            shopCategory.setNum(frontCategory.getNum());
+            shopCategory.setIsLeaves(frontCategory.getIsLeaves());
+            shopCategory.setRecTime(new Date());
+
+            shopCategoryMapper.insert(shopCategory);
+            log.info("门店分类添加成功：{}", shopCategory);
+            //二级添加门店-分类绑定商品管理
+            addCategoryProd(prodId, shopCategory);
+        } else {
+            log.info("门店分类已存在，无需添加");
+            //二级添加门店-分类绑定商品管理
+            addCategoryProd(prodId, shopCategoryByCode);
+            return;
+        }
+    }
 
-        //二级添加门店-分类管理
+    /**
+     * 添加门店-分类绑定商品管理
+     *
+     * @param prodId       商品id
+     * @param shopCategory 门店分类
+     */
+    private void addCategoryProd(Long prodId, ShopCategory shopCategory) {
+        log.info("添加门店-分类绑定商品管理");
         if (shopCategory.getLevel() == 2) {
-           Integer count = categoryProdMapper.selectCount(new LambdaQueryWrapper<CategoryProd>()
-                    .eq(CategoryProd::getCode, shopCategory.getCode())
+            Integer count = categoryProdMapper.selectCount(new LambdaQueryWrapper<CategoryProd>()
                     .eq(CategoryProd::getIsDelete, 0)
+                    .eq(CategoryProd::getCode, shopCategory.getCode())
+                    .eq(CategoryProd::getProdId, prodId)
                     .eq(CategoryProd::getShopId, shopCategory.getShopId()));
 
-           if (count == 0){
-               CategoryProd categoryProd = new CategoryProd();
-               categoryProd.setProdId(prodId);
-               categoryProd.setCategoryId(shopCategory.getId());
-               categoryProd.setCode(shopCategory.getCode());
-               categoryProd.setShopId(shopCategory.getShopId());
-               categoryProd.setIsDelete(0);
-               categoryProd.setCreateTime(new Date());
-
-               categoryProdMapper.insert(categoryProd);
-           }
+            if (count == 0) {
+                CategoryProd categoryProd = new CategoryProd();
+                categoryProd.setProdId(prodId);
+                categoryProd.setCategoryId(shopCategory.getId());
+                categoryProd.setCode(shopCategory.getCode());
+                categoryProd.setShopId(shopCategory.getShopId());
+                categoryProd.setIsDelete(0);
+                categoryProd.setCreateTime(new Date());
+
+                categoryProdMapper.insert(categoryProd);
+            }
         }
     }
 
@@ -380,6 +397,7 @@ public class HBGoodsService implements IHBGoodsService {
                     shopSkuInfo.setRecTime(new Date());
                     shopSkuInfo.setUpdateTime(new Date());
                     shopSkuMapper.insert(shopSkuInfo);
+
                     log.info("库存添加成功");
                 } else {
                     shopSku.setSpuId(sku.getProdId());
@@ -624,13 +642,13 @@ public class HBGoodsService implements IHBGoodsService {
             if (StringUtils.isEmpty(ztFrontCategoryCodeLevel)) {
                 ztFrontCategoryCodeLevel = jsonObject.getString("ztFrontCategoryCode");
             }
-            addCategoryProd(spuId, ztFrontCategoryCodeLevel);
+            addCategoryProdHb(spuId, ztFrontCategoryCodeLevel);
 
 
         }
     }
 
-    private void addCategoryProd(Long spuId, String ztFrontCategoryCodeLevel) {
+    private void addCategoryProdHb(Long spuId, String ztFrontCategoryCodeLevel) {
         CategoryProdHb categoryProd = new CategoryProdHb();
         categoryProd.setCode(ztFrontCategoryCodeLevel);
         categoryProd.setProdId(spuId);

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

@@ -255,8 +255,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return orderMapper.listUnRefundOrderAndOrderItems(orderStatus, lessThanUpdateTime);
     }
     @Override
-    public List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime) {
-        return orderMapper.cancelOrders(orderStatus, lessThanUpdateTime);
+    public List<Order> selectCancelOrders(Integer orderStatus, DateTime lessThanUpdateTime) {
+        return orderMapper.selectCancelOrders(orderStatus, lessThanUpdateTime);
     }
 
     @Override

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

@@ -229,7 +229,7 @@
     and o.dvy_time < #{lessThanUpdateTime}
   </select>
 
-    <select id="cancelOrders" resultMap="orderAndOrderItemMap">
+    <select id="selectCancelOrders" 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}