Merge remote-tracking branch 'origin/master'

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/order/TradeOrderStatusEnum.java

@@ -21,7 +21,8 @@ public enum TradeOrderStatusEnum implements IntArrayValuable {
     UNDELIVERED(10, "待发货"),
     DELIVERED(20, "已发货"),
     COMPLETED(30, "已完成"),
-    CANCELED(40, "已取消");
+    CANCELED(40, "已取消"),
+    AFTER_SALE(-2, "售后");
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderStatusEnum::getStatus).toArray();
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -11,25 +11,26 @@ import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import cn.newfeifan.mall.module.trade.enums.order.TradeOrderStatusEnum;
 import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderProperties;
 import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
 import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
@@ -56,6 +57,9 @@ public class TradeOrderController {
 
     @Resource
     private DeliveryExpressService deliveryExpressService;
+    @Resource
+    private AfterSaleService afterSaleService;
+
     @GetMapping("/page")
     @Operation(summary = "获得交易订单分页")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
@@ -84,6 +88,15 @@ public class TradeOrderController {
         return success(tradeOrderQueryService.getOrderSummary(reqVO));
     }
 
+  /*  @GetMapping("/order-count")
+    @Operation(summary = "获得交易订单统计")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<TradeOrderSummaryRespVO> getOrderCount(TradeOrderPageReqVO reqVO) {
+        Long orderCount = tradeOrderQueryService.getOrderCount(getLoginUserId(), null, null);
+        return success(orderCount);
+    }*/
+
+
     @GetMapping("/get-detail")
     @Operation(summary = "获得交易订单详情")
     @Parameter(name = "id", description = "订单编号", required = true, example = "1")
@@ -174,7 +187,19 @@ public class TradeOrderController {
     }
 
 
-
+    @GetMapping("/get-count")
+    @Operation(summary = "获得交易订单数量")
+    public CommonResult<Map<Integer, Long>> getOrderCount() {
+        Map<Integer, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(6);
+        orderCount.put(-1,tradeOrderQueryService.getOrderCount(null));
+        orderCount.put(-2,afterSaleService.getApplyingAfterSaleCount(null));
+        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus()));
+        return success(orderCount);
+    }
 
 
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderCountRespVO.java

@@ -0,0 +1,26 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo;
+
+import cn.newfeifan.mall.framework.common.validation.InEnum;
+import cn.newfeifan.mall.module.trade.enums.order.TradeOrderStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "管理后台 - 订单数量 Response VO")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderCountRespVO {
+
+    @Schema(description = "订单数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderCount;
+
+    @Schema(description = "订单状态", example = "1")
+    @InEnum(value = TradeOrderStatusEnum.class, message = "订单状态必须是 {value}")
+    private Integer status;
+
+
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/aftersale/AfterSaleMapper.java

@@ -44,7 +44,7 @@ public interface AfterSaleMapper extends BaseMapperX<AfterSaleDO> {
 
     default Long selectCountByUserIdAndStatus(Long userId, Collection<Integer> statuses) {
         return selectCount(new LambdaQueryWrapperX<AfterSaleDO>()
-                .eq(AfterSaleDO::getUserId, userId)
+                .eqIfPresent(AfterSaleDO::getUserId, userId)
                 .in(AfterSaleDO::getStatus, statuses));
     }
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -79,6 +79,10 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getStatus, status)
                 .eqIfPresent(TradeOrderDO::getCommentStatus, commentStatus));
     }
+    default Long selectCountByStatus(Integer status){
+        return selectCount(new LambdaQueryWrapperX<TradeOrderDO>()
+                .eqIfPresent(TradeOrderDO::getStatus, status));
+    };
 
     default TradeOrderDO selectOrderByIdAndUserId(Long orderId, Long loginUserId) {
         return selectOne(new LambdaQueryWrapperX<TradeOrderDO>()
@@ -124,4 +128,5 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
         );
     }
 
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -155,4 +155,10 @@ public interface TradeOrderQueryService {
      */
     List<TradeOrderItemDO> getOrderItemListByOrderId(Collection<Long> orderIds);
 
+    /**
+     * 根据状态获取订单数量, 不通过用户ID信息
+     * @param status
+     * @return
+     */
+    Long getOrderCount(Integer status);
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -157,6 +157,11 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     public Long getOrderCount(Long userId, Integer status, Boolean commentStatus) {
         return tradeOrderMapper.selectCountByUserIdAndStatus(userId, status, commentStatus);
     }
+    @Override
+    public Long getOrderCount(Integer status) {
+        return tradeOrderMapper.selectCountByStatus(status);
+
+    }
 
     @Override
     public List<ExpressTrackRespDTO> getExpressTrackList(Long id, Long userId) {
@@ -256,6 +261,8 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         return tradeOrderItemMapper.selectListByOrderId(orderIds);
     }
 
+
+
     /**
      * 获得自身的代理对象，解决 AOP 生效问题
      *

feifan-module-sale/feifan-module-sale-api/src/main/java/cn/newfeifan/mall/module/enums/MerchantStatusEnum.java

@@ -0,0 +1,38 @@
+package cn.newfeifan.mall.module.enums;
+
+import cn.newfeifan.mall.framework.common.core.IntArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * 交易订单 - 关闭类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum MerchantStatusEnum implements IntArrayValuable {
+
+    USING(10, "使用中"),
+    OVERDUE(20, "过期"),
+    STOP(30, "停用");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MerchantStatusEnum::getType).toArray();
+
+    /**
+     * 关闭类型
+     */
+    private final Integer type;
+    /**
+     * 关闭类型名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/MerchantController.java

@@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantPageReqVO.java

@@ -56,4 +56,7 @@ public class MerchantPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantRespVO.java

@@ -69,4 +69,8 @@ public class MerchantRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    @ExcelProperty("logo地址")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantSaveReqVO.java

@@ -52,4 +52,7 @@ public class MerchantSaveReqVO {
     @Schema(description = "服务到期时间")
     private LocalDateTime expireTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/ShopController.java

@@ -1,10 +1,5 @@
 package cn.newfeifan.mall.module.controller.admin.shop;
 
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopRespVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
-import cn.newfeifan.mall.module.service.shop.ShopService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -29,6 +25,9 @@ import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
 import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
 import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
 
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
+import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.module.service.shop.ShopService;
 
 @Tag(name = "管理后台 - 店铺")
 @RestController

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopPageReqVO.java

@@ -28,4 +28,7 @@ public class ShopPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopRespVO.java

@@ -33,4 +33,8 @@ public class ShopRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    @ExcelProperty("logo地址")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopSaveReqVO.java

@@ -24,4 +24,7 @@ public class ShopSaveReqVO {
     @NotNull(message = "商户id不能为空")
     private Long merchantId;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/merchant/MerchantDO.java

@@ -76,5 +76,9 @@ public class MerchantDO extends BaseDO {
      * 服务到期时间
      */
     private LocalDateTime expireTime;
+    /**
+     * logo地址
+     */
+    private String logoUrl;
 
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/shop/ShopDO.java

@@ -39,5 +39,9 @@ public class ShopDO extends BaseDO {
      * 商户id
      */
     private Long merchantId;
+    /**
+     * logo地址
+     */
+    private String logoUrl;
 
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/merchant/MerchantMapper.java

@@ -1,5 +1,7 @@
 package cn.newfeifan.mall.module.dal.mysql.merchant;
 
+import java.util.*;
+
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
@@ -30,6 +32,7 @@ public interface MerchantMapper extends BaseMapperX<MerchantDO> {
                 .eqIfPresent(MerchantDO::getBusinessLicensePicture, reqVO.getBusinessLicensePicture())
                 .betweenIfPresent(MerchantDO::getExpireTime, reqVO.getExpireTime())
                 .betweenIfPresent(MerchantDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(MerchantDO::getLogoUrl, reqVO.getLogoUrl())
                 .orderByDesc(MerchantDO::getId));
     }
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/shop/ShopMapper.java

@@ -1,11 +1,13 @@
 package cn.newfeifan.mall.module.dal.mysql.shop;
 
+import java.util.*;
+
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import org.apache.ibatis.annotations.Mapper;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 
 /**
  * 店铺 Mapper
@@ -21,6 +23,7 @@ public interface ShopMapper extends BaseMapperX<ShopDO> {
                 .eqIfPresent(ShopDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(ShopDO::getMerchantId, reqVO.getMerchantId())
                 .betweenIfPresent(ShopDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ShopDO::getLogoUrl, reqVO.getLogoUrl())
                 .orderByDesc(ShopDO::getId));
     }
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantService.java

@@ -1,10 +1,12 @@
 package cn.newfeifan.mall.module.service.merchant;
 
-import javax.validation.*;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
 import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
+
+import java.util.*;
+import javax.validation.*;
 
 /**
  * 商户 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantServiceImpl.java

@@ -1,16 +1,18 @@
 package cn.newfeifan.mall.module.service.merchant;
 
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
+import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
 
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import java.util.*;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
-import cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.enums.ErrorCodeConstants.MERCHANT_NOT_EXISTS;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopService.java

@@ -1,11 +1,11 @@
 package cn.newfeifan.mall.module.service.shop;
 
+import java.util.*;
 import javax.validation.*;
-
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
 
 /**
  * 店铺 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopServiceImpl.java

@@ -1,13 +1,15 @@
 package cn.newfeifan.mall.module.service.shop;
 
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.dal.mysql.shop.ShopMapper;