Merge remote-tracking branch 'origin/master'

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

@@ -66,7 +66,7 @@ public class FrontCategory implements Serializable {
     private Integer isDelete;
 
     /**
-     * 类目等级（0-一级，1-二级，2-三级）
+     * 类目等级（1-一级，2-二级，3-三级）
      */
     private Integer level;
 

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

@@ -72,7 +72,7 @@ public class ShopCategory implements Serializable {
     private Integer isDelete;
 
     /**
-     * 类目等级（0-一级，1-二级，2-三级）
+     * 类目等级（（1-一级，2-二级，3-三级）
      */
     private Integer level;
 

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/FrontCategoryVO.java

@@ -58,7 +58,7 @@ public class FrontCategoryVO{
     private Integer isDelete;
 
     /**
-     * 类目等级（0-一级，1-二级，2-三级）
+     * 类目等级（1-一级，2-二级，3-三级）
      */
     private Integer level;
 

yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java

@@ -101,11 +101,11 @@ public class PageParam<T> extends Page<T> {
 
     @Override
     public Page<T> setSize(long size) {
-        if (size > 100) {
-            this.size = 100;
-        } else {
-            this.size = size;
-        }
+//        if (size > 1000000) {
+//            this.size = 1000000;
+//        } else {
+//        }
+        this.size = size;
         return this;
     }
 

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopCategoryController.java

@@ -1,12 +1,8 @@
-// 文件路径: com/yami/shop/platform/controller/ShopCategoryController.java
 package com.yami.shop.platform.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yami.shop.bean.model.FrontCategory;
 import com.yami.shop.bean.model.ShopCategory;
-import com.yami.shop.bean.vo.FrontCategoryVO;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
 import com.yami.shop.service.IShopCategoryService;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/GoodsController.java

@@ -30,7 +30,7 @@ public class GoodsController {
      * @param HBRequest 海博商品请求参数
      * @return 商品信息响应
      */
-    @PostMapping("/add")
+    @PostMapping("117488990")
     @ApiOperation(value = "添加商品信息", notes = "海博新增商品信息回调接口")
     public HBR addGoods(@RequestBody JSONObject HBRequest) {
         log.info("海博新增商品{}",HBRequest);

yami-shop-security/yami-shop-security-platform/src/main/java/com/yami/shop/security/platform/config/ResourceServerConfiguration.java

@@ -51,6 +51,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                     "/webjars/**",
                     "/swagger/**",
                     "/platform/**",
+                    "/shop/**",
                     "/hb/**",
                     "/v2/api-docs",
                     "/doc.html",

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

@@ -44,6 +44,8 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<Order> deliverList(@Param("adapter") PageAdapter adapter, @Param("orderParam") BackendOrderParam orderParam);
 
+    Integer deliverListCount(@Param("orderParam") BackendOrderParam orderParam);
+
     Long countOrderDetial(@Param("orderParam") OrderParam orderParam);
 
     UserShoppingDataDto calculateUserInShopData(@Param("shopId") Long shopId, @Param("userId") String userId);

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

@@ -11,12 +11,8 @@
 package com.yami.shop.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yami.shop.bean.app.dto.ShopHeadInfoDto;
 import com.yami.shop.bean.model.ShopCategory;
-import com.yami.shop.bean.model.ShopDetail;
 import com.yami.shop.bean.vo.FrontCategoryVO;
-import com.yami.shop.common.util.PageParam;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -20,4 +20,10 @@ import org.apache.ibatis.annotations.Param;
 public interface ShopSkuMapper extends BaseMapper<ShopSku> {
 
     ShopSku selectByShopAndProd(@Param("skuId") Long skuId, @Param("shopId") Long shopId);
+
+    /**
+     * 根据商品id删除门店商品
+     * @param prodId 商品id
+     */
+    void deleteByProdId(@Param("skuId")Long prodId);
 }

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

@@ -3,10 +3,7 @@ package com.yami.shop.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yami.shop.bean.model.Category;
-import com.yami.shop.bean.model.FrontCategory;
 import com.yami.shop.bean.model.ShopCategory;
-import com.yami.shop.bean.vo.FrontCategoryVO;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;

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

@@ -19,6 +19,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -90,6 +93,7 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
                             .eq(ShopCategory::getIsDelete, 0));
                     for (ShopCategory shopCategory1 : shopCategory) {
                         shopCategory1.setName(frontCategory.getName());
+                        shopCategory1.setNum(frontCategory.getNum());
                         shopCategoryMapper.updateById(shopCategory1);
                     }
                 }
@@ -111,7 +115,6 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
      * @return
      */
     @Override
-    //添加事务
     @Transactional(rollbackFor = Exception.class)
     public void addShopCategory(FrontCategory frontCategory, Long shopId, Long hbShopId) {
         ShopCategory shopCategoryByCode = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
@@ -134,7 +137,7 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
                     .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));
@@ -161,7 +164,8 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
     @Override
     public void sync(Long shopId, Long hbShopId) {
         List<FrontCategory> frontCategoryList = frontCategoryMapper.selectList(new LambdaQueryWrapper<FrontCategory>()
-        .eq(FrontCategory::getIsDelete, 0));
+                .eq(FrontCategory::getIsDelete, 0));
+
         for (FrontCategory frontCategory : frontCategoryList) {
             addShopCategory(frontCategory, shopId, hbShopId);
         }
@@ -185,34 +189,16 @@ public class HBFrontCategoryService implements IHBFrontCategoryService {
     public void deleteFrontCategory(JSONObject hbRequest) {
         JSONObject body = hbRequest.getJSONObject("body");
         JSONArray codeList = body.getJSONArray("codeList");
-        for (Object code : codeList) {
-
-            log.info("前台类目删除，body：{}", code.toString());
-            FrontCategory frontCategory = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>().eq(FrontCategory::getCode, Long.valueOf(code.toString())));
+        for (Object codeObject : codeList) {
+            String code = codeObject.toString();
+            log.info("前台类目删除，body：{}", code);
+            FrontCategory frontCategory = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>().eq(FrontCategory::getCode, Long.valueOf(code)));
+            if(frontCategory == null){
+                return;
+            }
             frontCategory.setIsDelete(1);
             frontCategoryMapper.updateById(frontCategory);
-
-            ShopCategory shopCategory = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
-                    .eq(ShopCategory::getCode, frontCategory.getCode())
-                    .eq(ShopCategory::getIsDelete, 0));
-            shopCategory.setIsDelete(1);
-            int i = shopCategoryMapper.updateById(shopCategory);
-
-            if (frontCategory.getLevel() == 1) {
-                frontCategoryMapper.deleteByParentCode(frontCategory.getCode());
-            }
-
-            Integer integer = shopCategoryMapper.selectCount(new LambdaQueryWrapper<ShopCategory>()
-                    .eq(ShopCategory::getParentCode, shopCategory.getParentCode())
-                    .eq(ShopCategory::getIsDelete, 0));
-            if (integer == 0) {
-                ShopCategory shopCategory1 = shopCategoryMapper.selectOne(new LambdaQueryWrapper<ShopCategory>()
-                        .eq(ShopCategory::getCode, shopCategory.getParentCode())
-                        .eq(ShopCategory::getIsDelete, 0));
-                shopCategory1.setIsLeaves(1);
-                shopCategoryMapper.updateById(shopCategory1);
-            }
-
+            shopCategoryMapper.deleteByCode(code);
         }
     }
 }

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

@@ -326,6 +326,8 @@ public class HBGoodsService implements IHBGoodsService {
                 product.setIsDelete(1);
                 productMapper.updateById(product);
                 skuMapper.deleteByProdId(product.getProdId());
+                //删除门店对应商品
+                shopSkuMapper.deleteByProdId(product.getProdId());
             }
         }
     }

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

@@ -277,7 +277,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         List<ShopCategory> shopCategories = shopCategoryMapper.selectList(new LambdaQueryWrapper<ShopCategory>()
                 .eq(ShopCategory::getShopId, shopId)
                 .eq(ShopCategory::getIsDelete, Boolean.FALSE)
-                .orderByDesc(ShopCategory::getNum));
+                .orderByAsc(ShopCategory::getNum));
         if (CollectionUtil.isEmpty(shopCategories)) {
             return Collections.emptyList();
         }
@@ -321,6 +321,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
                     // 递归构建子分类树，层级 +1
                     List<ShopCategory> children = parentMap.getOrDefault(category.getId(), Collections.emptyList());
+
+                    children.sort(Comparator.comparingInt(ShopCategory::getNum));
+
                     vo.setChildren(buildCategoryTree(children, parentMap, currentLevel + 1));
 
                     return vo;

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

@@ -349,7 +349,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             });
         }
         page.setRecords(orderList);
-        page.setTotal(orderList.size());
+        page.setTotal(orderMapper.deliverListCount(orderParam));
         return page;
     }
 

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

@@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yami.shop.bean.dto.ShopCategoryExcelDTO;
 import com.yami.shop.bean.model.*;
-import com.yami.shop.bean.model.ShopCategory;
-import com.yami.shop.bean.vo.FrontCategoryVO;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.dao.FrontCategoryMapper;
 import com.yami.shop.dao.LabelMapper;
@@ -21,7 +19,6 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.core.annotation.OrderUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -24,7 +24,6 @@ public class ShopSkuServiceImpl extends ServiceImpl<ShopSkuMapper, ShopSku> impl
     private final ShopSkuMapper shopProdMapper;
     private final ChannelProdMapper channelProdMapper;
     private final SkuMapper skuMapper;
-    private final ProductMapper productMapper;
     private final ShopDetailMapper shopDetailMapper;
 
 

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

@@ -513,6 +513,60 @@
         LIMIT #{adapter.begin} , #{adapter.size}
     </select>
 
+    <select id="deliverListCount" resultType="integer">
+        SELECT count(1) FROM tz_order a
+        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
+            <if test="orderParam.orderNumber != null and orderParam.orderNumber != ''">
+                and a.order_number = #{orderParam.orderNumber}
+            </if>
+            <if test="orderParam.shopId != null">
+                and a.shop_id = #{orderParam.shopId}
+            </if>
+            <if test="orderParam.startTime != null">
+                and a.create_time &gt; #{orderParam.startTime}
+            </if>
+            <if test="orderParam.endTime != null">
+                and a.create_time &lt; #{orderParam.endTime}
+            </if>
+            <if test="orderParam.refundStatus != null and orderParam.refundStatus != 0">
+                and a.refund_status = #{orderParam.refundStatus}
+            </if>
+            <if test="orderParam.receiver != null">
+                and b.receiver LIKE concat("%",#{orderParam.receiver},"%")
+            </if>
+            <if test="orderParam.mobile != null">
+                and b.mobile LIKE concat("%",#{orderParam.mobile},"%")
+            </if>
+
+            <if test="orderParam.orderStatus != null and orderParam.orderStatus != ''">
+                <if test="orderParam.orderStatus == 'all'">
+                    AND a.hb_order_status in (0, 1,20,30,40,50,60,70,80)
+                </if>
+                <if test="orderParam.orderStatus == 'paddingPay'">
+                    AND a.hb_order_status in (0)
+                </if>
+
+                <if test="orderParam.orderStatus == 'paddingShipped'">
+                    AND a.hb_order_status in (1)
+                </if>
+
+                <if test="orderParam.orderStatus == 'paddingReceived'">
+                    AND a.hb_order_status in (20,30,40,50,70)
+                </if>
+                <if test="orderParam.orderStatus == 'completed'">
+                    AND a.hb_order_status in (80)
+                </if>
+                <if test="orderParam.orderStatus == 'cancel'">
+                    AND a.hb_order_status in (60)
+                </if>
+            </if>
+        </where>
+    </select>
+
+
 
     <select id="countOrderDetial" resultType="long">
         SELECT count(0)

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

@@ -612,6 +612,10 @@
         LEFT JOIN tz_shop_detail sd ON sd.shop_id = tss.shop_id
         LEFT JOIN tz_prod_comm pc ON p.prod_id = pc.prod_id
         LEFT JOIN tz_channel_prod tcp ON tss.sku_id = tcp.sku_id
+
+        LEFT JOIN tz_category_prod cp on p.prod_id = cp.prod_id
+        LEFT JOIN tz_shop_category sc on cp.code = sc.code
+
         where 1 = 1 and p.`status` = 1 and p.`is_delete`=0 and tcp.is_delete=0 and tss.shop_id in
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item}
@@ -627,7 +631,7 @@
         </if>
 
         <if test="searchParam.categoryId != null">
-            and p.category_id = #{searchParam.categoryId}
+            and sc.id = #{searchParam.categoryId}
         </if>
         <if test="searchParam.shopCategoryId != null">
             and p.shop_category_id = #{searchParam.shopCategoryId}
@@ -682,6 +686,8 @@
         ANY_VALUE(p.update_time) AS update_time
         FROM
         tz_prod p
+        LEFT JOIN tz_category_prod cp on p.prod_id = cp.prod_id
+        LEFT JOIN tz_shop_category sc on cp.code = sc.code
         WHERE
         1 = 1
         AND p.`status` = 1 and p.`is_delete`=0
@@ -692,7 +698,7 @@
             AND p.shop_id = #{searchParam.shopId}
         </if>
         <if test="searchParam.categoryId != null">
-            AND p.shop_category_id = #{searchParam.categoryId}
+            AND sc.id = #{searchParam.categoryId}
         </if>
         <if test="searchParam.shopCategoryId != null">
             AND p.shop_category_id = #{searchParam.shopCategoryId}

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

@@ -15,7 +15,11 @@
     <result column="rec_time" property="recTime"/>
   </resultMap>
 
-  <select id="selectByShopAndProd" resultMap="shopProdMap">
+  <update id="deleteByProdId">
+    UPDATE tz_shop_sku SET is_delete = 1 WHERE spu_id = #{prodId}
+  </update>
+
+    <select id="selectByShopAndProd" resultMap="shopProdMap">
     SELECT * FROM tz_shop_sku
     WHERE shop_id = #{shopId} AND sku_id = #{skuId} AND is_delete = 0
   </select>