查看店铺经营范围

framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java

@@ -40,9 +40,6 @@ public class GoodsSearchParams extends PageVO {
     @ApiModelProperty(value = "分类path")
     private String categoryPath;
 
-    @ApiModelProperty(value = "是否是积分商品")
-    private Boolean isPoint;
-
     @ApiModelProperty(value = "店铺分类id")
     private String storeCategoryPath;
 
@@ -93,9 +90,6 @@ public class GoodsSearchParams extends PageVO {
         if (StringUtils.isNotEmpty(categoryPath)) {
             queryWrapper.like("category_path", categoryPath);
         }
-        if (isPoint != null) {
-            queryWrapper.eq("is_point", isPoint);
-        }
         if (StringUtils.isNotEmpty(storeCategoryPath)) {
             queryWrapper.like("store_category_path", storeCategoryPath);
         }

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java

@@ -1,8 +1,6 @@
 package cn.lili.modules.order.cart.render.impl;
 
 import cn.hutool.core.util.NumberUtil;
-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.member.entity.dos.MemberAddress;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
@@ -53,7 +51,9 @@ public class SkuFreightRender implements CartRenderStep {
             }
             //寻找对应对商品运费计算模版
             FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId);
-            if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
+            if (freightTemplate != null
+                    && freightTemplate.getFreightTemplateChildList() != null
+                    && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
                 //店铺支付运费则跳过
                 if (freightTemplate.getPricingMethod().equals(FreightTemplateEnum.FREE.name())) {
                     break;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -5,24 +5,21 @@ import cn.lili.base.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.base.entity.enums.ClientTypeEnum;
 import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
+import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
+import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
-import cn.lili.modules.order.order.entity.enums.DeliverStatusEnum;
+import cn.lili.modules.order.order.entity.enums.*;
-import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
-import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
-import cn.lili.modules.order.cart.entity.dto.TradeDTO;
-import cn.lili.modules.order.cart.entity.vo.CartVO;
-import cn.lili.modules.order.order.entity.enums.*;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -88,6 +85,7 @@ public class Order extends BaseEntity {
     private String paymentMethod;
 
     @ApiModelProperty(value = "支付时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date paymentTime;
 

framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java

@@ -98,8 +98,8 @@ public class OrderSearchParams extends PageVO {
 
         //关键字查询
         if (StringUtils.isNotEmpty(keywords)) {
-            wrapper.and(queryWrapper -> wrapper.like("o.sn", keywords).or().
+            wrapper.like("o.sn", keywords);
-                    like("oi.goods_name", keywords));
+            wrapper.like("oi.goods_name", keywords);
         }
         //按卖家查询
         wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), "o.store_id", UserContext.getCurrentUser().getStoreId());
@@ -126,13 +126,13 @@ public class OrderSearchParams extends PageVO {
 
         //按订单类型
         if (StringUtils.isNotEmpty(orderType)) {
-            wrapper.and(queryWrapper-> queryWrapper.eq("o.order_type", orderType).or()
+            wrapper.and(queryWrapper -> queryWrapper.eq("o.order_type", orderType).or()
                     .eq("o.order_promotion_type", orderType));
         }
 
 
         //物流查询
-        wrapper.like(StringUtils.isNotEmpty(shipName), "o.ship_name", shipName);
+        wrapper.like(StringUtils.isNotEmpty(shipName), "o.consignee_name", shipName);
 
         //按商品名称查询
         wrapper.like(StringUtils.isNotEmpty(goodsName), "oi.goods_name", goodsName);

framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java

@@ -84,7 +84,6 @@ public class AfterSaleSearchParams extends PageVO {
         if (StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
                 && StringUtils.isNotEmpty(storeId)
         ) {
-
             queryWrapper.eq("store_id", storeId);
         }
         if (StringUtils.isNotEmpty(memberName)) {

framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java

@@ -2,19 +2,19 @@ package cn.lili.modules.payment.serviceimpl;
 
 import cn.lili.modules.order.order.entity.vo.PaymentLog;
 import cn.lili.modules.order.order.mapper.OrderMapper;
-import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.CashierSupport;
+import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.params.CashierExecute;
 import cn.lili.modules.payment.service.PaymentService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -32,7 +32,7 @@ public class PaymentServiceImpl implements PaymentService {
     private List<CashierExecute> cashierExecutes;
     @Autowired
     private CashierSupport cashierSupport;
-    @Autowired
+    @Resource
     private OrderMapper orderMapper;
 
     @Override

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java

@@ -118,7 +118,7 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
         //获取顶部分类列表
         List<Category> categoryList = categoryService.firstCategory();
         //获取店铺信息
-        StoreDetail storeDetail = this.getById(storeId);
+        StoreDetail storeDetail = this.getOne(new LambdaQueryWrapper<StoreDetail>().eq(StoreDetail::getStoreId,storeId));
         //获取店铺分类
         String[] storeCategoryList = storeDetail.getGoodsManagementCategory().split(",");
         List<StoreManagementCategoryVO> list = new ArrayList<>();

framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java

@@ -39,7 +39,7 @@ public interface StoreLogisticsMapper extends BaseMapper<StoreLogistics> {
      * @param storeId 店铺列表
      * @return 店铺地址VO列表
      */
-    @Select("SELECT *, ( SELECT sl.id FROM li_store_logistics sl WHERE l.id = sl.logistics_id AND sl.store_id=#{storeId} ) AS selected FROM li_logistics l AND l.disabled='OPEN';")
+    @Select("SELECT *, ( SELECT sl.id FROM li_store_logistics sl WHERE l.id = sl.logistics_id AND sl.store_id=#{storeId} ) AS selected FROM li_logistics l WHERE l.disabled='OPEN';")
     List<StoreLogisticsVO> getStoreLogistics(String storeId);
 
 }

manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java

@@ -58,7 +58,7 @@ public class PageDataManagerController {
     }
 
     @ApiOperation(value = "页面列表")
-    @GetMapping("pageDataList")
+    @GetMapping("/pageDataList")
     public ResultMessage<IPage<PageDataListVO>> pageDataList(PageVO pageVO, PageDataDTO pageDataDTO) {
         return ResultUtil.data(pageDataService.getPageDataList(pageVO, pageDataDTO));
     }

manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java

@@ -111,8 +111,8 @@ public class StoreManagerController {
 
     @ApiOperation(value = "查询一级分类列表")
     @ApiImplicitParam(name = "storeId", value = "店铺id", required = true, dataType = "String", paramType = "path")
-    @GetMapping(value = "/ManagementCategory/{storeId}")
+    @GetMapping(value = "/managementCategory/{storeId}")
-    public ResultMessage<List<CategoryVO>> firstCategory(String storeId) {
+    public ResultMessage<List<CategoryVO>> firstCategory(@PathVariable String storeId) {
         return ResultUtil.data(this.storeDetailService.goodsManagementCategory(storeId));
     }