重构接口优化

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/StoreActMachineDayDetailDTO.java

@@ -3,6 +3,7 @@ package com.kxs.product.api.dto.kxsapp.machine;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 
 /**
@@ -11,41 +12,16 @@ import lombok.Data;
  * @author 系统
  * @date 2024-01-08 10:33:18
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class StoreActMachineDayDetailDTO {
-
-    /**
-     * 仓库ID
-     */
-    @Schema(description = "仓库ID")
-    @NotNull(message = "仓库ID不能为空")
-    private Integer warehouseId;
-
-
-    /**
-     * 品牌id
-     */
-    @Schema(description = "品牌id")
-    @NotNull(message = "品牌ID不能为空")
-    private Integer brandId;
-
+public class StoreActMachineDayDetailDTO extends StoreActMachineMonthTotalDTO{
 
     /**
      * 月份
      */
     @Schema(description = "月份")
     @NotNull(message = "月份不能为空")
-    private String month;
-
+    private String totalMonth;
 
-    /**
-     * 开始日期
-     */
-    private String startDate;
-
-    /**
-     * 结束日期
-     */
-    private String endDate;
 
 }

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/StoreActMachineDayDetailVO.java

@@ -1,43 +0,0 @@
-package com.kxs.product.api.vo.kxsapp.machine;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 订单管理-激活统计明细vo
- *
- * @author 系统
- * @date 2024-01-08 10:33:18
- */
-@Data
-@Schema(description = "订单管理-激活统计明细返回实体")
-public class StoreActMachineDayDetailVO implements Serializable {
-
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 时间
-     */
-    @Schema(description = "时间")
-    private Object date;
-
-
-    /**
-     * 激活总数
-     */
-    @Schema(description = "激活总数")
-    private Object totalNumber;
-
-
-
-
-
-	
-
-}

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -277,33 +277,6 @@ public class MachineController {
         return R.ok(kxsMachineService.updateById(machine));
     }
 
-    /**
-     * 订单管理-激活统计
-     *
-     * @param page 分页对象
-     * @param param 查询实体
-     * @return 订单管理-激活统计
-     */
-    @GetMapping("/activateMachineMonthTotal")
-    public R activateMachineMonthTotal(@ParameterObject Page<StoreActMachineMonthTotalVO> page, @Valid @ParameterObject StoreActMachineMonthTotalDTO param) {
-
-        return R.ok(kxsMachineService.activateMachineMonthTotal(page, param));
-    }
-
-
-    /**
-     * 订单管理-激活统计明细
-     *
-     * @param page 分页对象
-     * @param param 查询实体
-     * @return 订单管理-激活统计明细
-     */
-    @GetMapping("/activateMachineMonthTotalDetail")
-    public R activateMachineMonthTotalDetail(@ParameterObject Page<StoreActMachineDayDetailVO> page, @Valid @ParameterObject StoreActMachineDayDetailDTO param) {
-
-        return R.ok(kxsMachineService.activateMachineMonthTotalDetail(page, param));
-    }
-
     @Inner
     @GetMapping("/loadMachineBySn")
     public R loadMachineBySn(@RequestParam("sn") String sn){

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/ShopController.java

@@ -56,6 +56,7 @@ public class ShopController {
      */
     @GetMapping("/goodsList")
     public R goodsList(@ParameterObject Page<ShopGoodsListVO> page, @RequestParam("colId") Integer colId) {
+
         return R.ok(kxsShopGoodsService.getByPage(page, colId));
     }
 
@@ -117,6 +118,7 @@ public class ShopController {
      */
     @GetMapping("/orderList")
     public R orderList(@ParameterObject Page<ShopOrderListVO> page, @ParameterObject KxsShopOrder param) {
+
         return R.ok(kxsShopOrderService.getByPage(page, param));
     }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java

@@ -92,24 +92,6 @@ public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
      */
     IPage<MachineRecycleListVO> recyclePageList(Page<MachineRecycleListVO> page, @Param("query") RecycleMachineQuery query);
 
-    /**
-     * 仓库激活统计
-     *
-     * @param page  页
-     * @param param 参数
-     * @return {@link IPage}<{@link StoreActMachineMonthTotalVO}>
-     */
-    IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, @Param("query") StoreActMachineMonthTotalDTO param);
-
-    /**
-     * 仓库-激活统计明细
-     *
-     * @param page  页
-     * @param param 参数
-     * @return {@link IPage}<{@link StoreActMachineDayDetailVO}>
-     */
-    IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, @Param("query") StoreActMachineDayDetailDTO param);
-
     /**
      * 查询循环过期机具，并且扣除没有添加已扣款的机器
      *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
 import com.kxs.product.api.dto.kxsapp.GetActivityMachineByIdAndTimeDTO;
 import com.kxs.product.api.dto.kxsapp.machine.*;
-import com.kxs.product.api.dto.kxsapp.merchant.MachineRatioDTO;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.vo.kxsapp.machine.*;
-import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
 
 import java.util.List;
@@ -110,23 +108,6 @@ public interface KxsMachineService extends IService<KxsMachine> {
      */
     IPage<MachineRecycleListVO> recycleList(Page<MachineRecycleListVO> page, RecycleMachineQuery param);
 
-    /**
-     * 仓库-激活统计
-     *
-     * @param page  页
-     * @param param 参数
-     * @return {@link IPage}<{@link StoreActMachineMonthTotalVO}>
-     */
-    IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, StoreActMachineMonthTotalDTO param);
-
-    /**
-     * 仓库-激活统计明细
-     *
-     * @param page  页
-     * @param param 参数
-     * @return {@link IPage}<>
-     */
-    IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, StoreActMachineDayDetailDTO param);
 
     /**
      * 循环过期机具列表
@@ -141,6 +122,7 @@ public interface KxsMachineService extends IService<KxsMachine> {
      * @param para 段落
      */
     void recycleMachineSchedule(String para);
+
     /**
      * 可回收机具品牌列表
      *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -226,27 +226,6 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         return baseMapper.recyclePageList(page, param);
     }
 
-    @Override
-    public IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, StoreActMachineMonthTotalDTO param) {
-
-        return baseMapper.activateMachineMonthTotal(page, param);
-    }
-
-    @Override
-    public IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, StoreActMachineDayDetailDTO param) {
-
-        String month = param.getMonth() + "-01";
-        //根据月份获取本月开始时间和结束时间
-        LocalDate date = LocalDate.parse(month, DatePattern.NORM_DATE_FORMATTER);
-        LocalDateTime startTime = LocalDateTime.of(date, LocalTime.MIN);
-        LocalDateTime endTime = LocalDateTime.of(date.plusMonths(1), LocalTime.MIN);
-
-        param.setStartDate(String.valueOf(startTime));
-        param.setEndDate(String.valueOf(endTime));
-
-        return baseMapper.activateMachineMonthTotalDetail(page, param);
-    }
-
     @Override
     public List<ExpiredModalBrandVO> expiredModal() {
         Long userId = SecurityUtils.getUser().getId();

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsShopOrderServiceImpl.java

@@ -166,7 +166,7 @@ public class KxsShopOrderServiceImpl extends ServiceImpl<KxsShopOrderMapper, Kxs
             //商品实物或虚拟物品标识
             KxsShopGoods kxsShopGoods = kxsShopGoodsMapper.selectById(item.getGoodsId());
             ShopOrderInfoListVO infoListVO = new ShopOrderInfoListVO();
-            BeanUtils.copyProperties(item, infoListVO);
+            BeanUtil.copyProperties(item, infoListVO);
             infoListVO.setGoodsType(kxsShopGoods.getGoodsType());
             shopOrderDetailVO.getGoodsList().add(infoListVO);
         });

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -151,39 +151,7 @@
         order by recycle_end_time desc
     </select>
 
-    <select id="activateMachineMonthTotal"
-            resultType="com.kxs.product.api.vo.kxsapp.machine.StoreActMachineMonthTotalVO">
-        select * from
-        (
-        select count(id) as totalNumber, DATE_FORMAT(act_time,'%Y-%m') AS `month`
-        from kxs_machine a
-        <where>
-            and a.brand_id = #{query.brandId}
-            and a.warehouse_id = #{query.warehouseId}
-            and a.is_act = 1
-        </where>
-        GROUP BY `month`
-        ) as tmp
-        ORDER BY `month` desc
-    </select>
-    <select id="activateMachineMonthTotalDetail"
-            resultType="com.kxs.product.api.vo.kxsapp.machine.StoreActMachineDayDetailVO">
-        SELECT *
-        FROM (
-        SELECT count(id) as number, DATE_FORMAT(act_time,'%Y-%m-%d') AS `date`
-        FROM kxs_machine a
-        <where>
-            and a.brand_id = #{query.brandId}
-            and a.warehouse_id = #{query.warehouseId}
-            and a.is_act = 1
-            <if test="query.startDate != null and query.endDate != null">
-                and a.act_time between #{query.startDate} and #{query.endDate}
-            </if>
-        </where>
-        GROUP BY `date`
-        ) AS tmp
-        ORDER BY `date` desc
-    </select>
+
     <select id="selectDeductList" resultMap="KxsMachineMap">
         select a.id, a.user_id, a.pos_sn, a.brand_id, a.recycle_end_time
         from kxs_machine a

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopGoodsMapper.xml

@@ -20,7 +20,6 @@
         <result column="goods_type" property="goodsType" />
         <result column="up_time" property="upTime" />
         <result column="down_time" property="downTime" />
-        <result column="sku_json" property="skuJson" />
 
     </resultMap>
 

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopOrderMapper.xml

@@ -58,9 +58,14 @@
                 SELECT * FROM kxs_shop_order
                 <where>
                     del_flag = 0
-                    <if test="query.status != null">
-                        and status = #{query.status}
-                    </if>
+                    <choose>
+                        <when test="query.status != null">
+                            and status = #{query.status}
+                        </when>
+                        <otherwise>
+                            and status <![CDATA[ < ]]> 4
+                        </otherwise>
+                    </choose>
                     and user_id = #{query.userId}
                 </where>
                 LIMIT #{start}, #{size}

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/controller/KxsUserActTradeController.java

@@ -0,0 +1,27 @@
+package com.kxs.stat.biz.controller;
+
+
+import com.kxs.stat.biz.service.KxsUserActTradeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户表(KxsUserActTrade)表控制层
+ *
+ * @author Pota1ovO
+ * @since 2024-05-08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("act")
+public class KxsUserActTradeController {
+
+    private final KxsUserActTradeService kxsUserActTradeService;
+
+
+
+
+
+}
+

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/StoreActMachineMonthTotalVO.java → kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeAct/StoreActTotalVO.java

@@ -1,4 +1,4 @@
-package com.kxs.product.api.vo.kxsapp.machine;
+package com.kxs.store.api.vo.kxsapp.storeAct;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -15,24 +15,24 @@ import java.io.Serializable;
  */
 @Data
 @Schema(description = "订单管理-激活统计返回实体")
-public class StoreActMachineMonthTotalVO implements Serializable {
+public class StoreActTotalVO implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
 
 
     /**
-     * 激活月份
+     * 激活时间
      */
-    @Schema(description = "激活月份")
-    private String month;
+    @Schema(description = "激活时间")
+    private String time;
 
 
     /**
      * 激活总数量
      */
     @Schema(description = "激活总数量")
-    private Integer totalNumber;
+    private Integer totalNum;
 
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/UserAdvanceListVO.java

@@ -34,12 +34,42 @@ public class UserAdvanceListVO implements Serializable {
     @Schema(description = "品牌名称")
     private String brandName;
 
+    /**
+     * 品牌ID
+     */
+    private Integer brandId;
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
 
     /**
-     * sn列表
+     * 机具码
      */
-    @Schema(description = "sn列表")
-    private List<UserAdvanceListInfoVO> snList;
+    @Schema(description = "机具码")
+    private String posSn;
 
+    /**
+     * 是否占用预发额度 0否 1是
+     */
+    @Schema(description = "是否占用预发额度 0否 1是")
+    private Integer isUseAmount;
 
+    /**
+     * 是否预扣款 0否 1是
+     */
+    @Schema(description = "是否预扣款 0否 1是")
+    private Integer isAdvance;
+
+    /**
+     * 地区
+     */
+    private String areas;
+
+    /**
+     * 机具 ID
+     */
+    private Integer machineId;
 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreActTotalController.java

@@ -0,0 +1,57 @@
+package com.kxs.store.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineDayDetailDTO;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineMonthTotalDTO;
+import com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO;
+import com.kxs.store.biz.service.KxsActTotalService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 仓库模块激活统计控制器
+ *
+ * @author 系统
+ * @since 2024-01-10 11:43:19
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("storeAct")
+public class StoreActTotalController {
+
+    private final KxsActTotalService kxsActTotalService;
+
+
+    /**
+     * 订单管理-激活统计
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 订单管理-激活统计
+     */
+    @GetMapping("/activateMachineMonthTotal")
+    public R activateMachineMonthTotal(@ParameterObject Page<StoreActTotalVO> page, @Valid @ParameterObject StoreActMachineMonthTotalDTO param) {
+
+        return R.ok(kxsActTotalService.activateMachineMonthTotal(page, param));
+    }
+
+
+    /**
+     * 订单管理-激活统计明细
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 订单管理-激活统计明细
+     */
+    @GetMapping("/activateMachineMonthTotalDetail")
+    public R activateMachineMonthTotalDetail(@ParameterObject Page<StoreActTotalVO> page, @Valid @ParameterObject StoreActMachineDayDetailDTO param) {
+
+        return R.ok(kxsActTotalService.activateMachineMonthTotalDetail(page, param));
+    }
+
+
+}
+

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/UserAdvanceController.java

@@ -63,13 +63,12 @@ public class UserAdvanceController {
     /**
      * 预发机列表
      *
-     * @param page 分页对象
      * @return 预发机列表
      */
     @GetMapping("/advanceUserList")
-    public R advanceUserList(@ParameterObject Page<UserAdvanceListVO> page) {
+    public R advanceUserList() {
 
-        return R.ok(kxsMachineAdvanceService.advanceUserList(page));
+        return R.ok(kxsMachineAdvanceService.advanceUserList());
     }
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsActTotalMapper.java

@@ -1,8 +1,14 @@
 package com.kxs.store.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineDayDetailDTO;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineMonthTotalDTO;
 import com.kxs.store.api.model.KxsActTotal;
+import com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 客小爽仓库激活统计表(KxsActTotal)表数据库访问层
@@ -13,5 +19,23 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsActTotalMapper extends BaseMapper<KxsActTotal> {
 
+    /**
+     * 仓库激活统计分页
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActTotalVO}>
+     */
+    IPage<StoreActTotalVO> getByPage(Page<StoreActTotalVO> page, @Param("param") StoreActMachineMonthTotalDTO param);
+
+    /**
+     * 仓库激活统计明细分页
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActMachineDayDetailDTO}>
+     */
+    IPage<StoreActTotalVO> getByDetailPage(Page<StoreActTotalVO> page, @Param("param") StoreActMachineDayDetailDTO param);
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineAdvanceMapper.java

@@ -74,7 +74,7 @@ public interface KxsMachineAdvanceMapper extends BaseMapper<KxsMachineAdvance> {
      * @param userId 用户ID
      * @return {@link IPage}<{@link UserAdvanceListVO}>
      */
-    IPage<UserAdvanceListVO> advanceUserList(Page<UserAdvanceListVO> page, @Param("userId") Long userId);
+    List<UserAdvanceListVO> advanceUserList(Long userId);
 
     /**
      * 仓库预发机数量

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsActTotalService.java

@@ -1,6 +1,11 @@
 package com.kxs.store.biz.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineDayDetailDTO;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineMonthTotalDTO;
+import com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO;
 import com.kxs.store.api.model.KxsActTotal;
 
 /**
@@ -11,5 +16,23 @@ import com.kxs.store.api.model.KxsActTotal;
  */
 public interface KxsActTotalService extends IService<KxsActTotal> {
 
+    /**
+     * 仓库激活统计
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActTotalVO}>
+     */
+    IPage<StoreActTotalVO> activateMachineMonthTotal(Page<StoreActTotalVO> page, StoreActMachineMonthTotalDTO param);
+
+    /**
+     * 仓库激活统计明细
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActMachineDayDetailDTO}>
+     */
+    IPage<StoreActTotalVO> activateMachineMonthTotalDetail(Page<StoreActTotalVO> page, StoreActMachineDayDetailDTO param);
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsMachineAdvanceService.java

@@ -75,9 +75,8 @@ public interface KxsMachineAdvanceService extends IService<KxsMachineAdvance> {
     /**
      * 用户预发机列表
      *
-     * @param page 页
      * @return {@link IPage}<{@link UserAdvanceListVO}>
      */
-    IPage<UserAdvanceListVO> advanceUserList(Page<UserAdvanceListVO> page);
+    List<UserAdvanceListVO> advanceUserList();
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsActTotalServiceImpl.java

@@ -1,6 +1,11 @@
 package com.kxs.store.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineDayDetailDTO;
+import com.kxs.product.api.dto.kxsapp.machine.StoreActMachineMonthTotalDTO;
+import com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO;
 import com.kxs.store.biz.mapper.KxsActTotalMapper;
 import com.kxs.store.api.model.KxsActTotal;
 import com.kxs.store.biz.service.KxsActTotalService;
@@ -15,5 +20,16 @@ import org.springframework.stereotype.Service;
 @Service("kxsActTotalService")
 public class KxsActTotalServiceImpl extends ServiceImpl<KxsActTotalMapper, KxsActTotal> implements KxsActTotalService {
 
+    @Override
+    public IPage<StoreActTotalVO> activateMachineMonthTotal(Page<StoreActTotalVO> page, StoreActMachineMonthTotalDTO param) {
+
+        return baseMapper.getByPage(page, param);
+    }
+
+    @Override
+    public IPage<StoreActTotalVO> activateMachineMonthTotalDetail(Page<StoreActTotalVO> page, StoreActMachineDayDetailDTO param) {
+
+        return baseMapper.getByDetailPage(page, param);
+    }
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineAdvanceServiceImpl.java

@@ -26,7 +26,6 @@ import com.kxs.store.api.model.*;
 import com.kxs.store.api.vo.kxsapp.store.StoreAdvanceMachineVO;
 import com.kxs.store.api.vo.kxsapp.storeAdvance.UserWarehouseListVO;
 import com.kxs.store.api.vo.kxsapp.userAdvance.AdvanceDevModalVO;
-import com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListInfoVO;
 import com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListVO;
 import com.kxs.store.biz.constant.enums.StoreErrorTypeEnum;
 import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
@@ -48,6 +47,8 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.sn;
+
 /**
  * 客小爽预发机表(KxsMachineAdvance)表服务实现类
  *
@@ -251,6 +252,9 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
             KxsMachine machine = RetOps.of(kxsMachineR)
                     .getData()
                     .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.SN_FIND_NULL.getDescription()));
+            if(machine.getPreUserId() > 0){
+                throw new GlobalCustomerException("机具已"+machine.getPosSn()+"预发，不能重复预发");
+            }
             //新增预发机明细
             KxsMachineAdvanceInfo kxsMachineAdvanceInfo = new KxsMachineAdvanceInfo();
             kxsMachineAdvanceInfo.setOrderId(kxsMachineAdvance.getId());
@@ -380,19 +384,22 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
     }
 
     @Override
-    public IPage<UserAdvanceListVO> advanceUserList(Page<UserAdvanceListVO> page) {
+    public List<UserAdvanceListVO> advanceUserList() {
+
         Long userId = SecurityUtils.getUser().getId();
-        IPage<UserAdvanceListVO> listPage = baseMapper.advanceUserList(page, userId);
-        for (UserAdvanceListVO record : listPage.getRecords()) {
-            for (UserAdvanceListInfoVO mch : record.getSnList()) {
-                R<KxsMachine> machineResult = remoteKxsProductService.loadMachineById(mch.getMachineId(), SecurityConstants.FROM_IN);
-                KxsMachine machine = RetOps.of(machineResult)
+        List<UserAdvanceListVO> userAdvanceList = baseMapper.advanceUserList(userId);
+        for (UserAdvanceListVO advanceListVO : userAdvanceList) {
+
+            //只有广电卡查询地址信息
+            if(advanceListVO.getBrandId() == 14){
+                R<KxsMachine> kxsMachineR = remoteKxsProductService.loadMachineBySn(advanceListVO.getPosSn(), SecurityConstants.FROM_IN);
+                KxsMachine machine = RetOps.of(kxsMachineR)
                         .getData()
                         .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.SN_FIND_NULL.getDescription()));
-                mch.setAreas(machine.getDevLocation());
+                advanceListVO.setAreas(machine.getDevLocation());
             }
         }
-        return listPage;
+        return userAdvanceList;
     }
 
 

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsActTotalMapper.xml

@@ -15,5 +15,27 @@
         <result column="brand_id" property="brandId" />
 
     </resultMap>
+    <select id="getByPage" resultType="com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO">
+        SELECT SUM(total_num) as total_num, total_month as time
+        FROM kxs_act_total
+        <where>
+            and brand_id = #{param.brandId}
+            and warehouse_id = #{param.warehouseId}
+        </where>
+        group by total_month
+        order by total_month desc
+    </select>
+    <select id="getByDetailPage"
+            resultType="com.kxs.store.api.vo.kxsapp.storeAct.StoreActTotalVO">
+
+        SELECT total_num, total_date as time
+        FROM kxs_act_total
+        <where>
+            and brand_id = #{param.brandId}
+            and warehouse_id = #{param.warehouseId}
+            and total_month = #{param.totalMonth}
+        </where>
+        order by total_date desc
+    </select>
 
 </mapper>

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineAdvanceMapper.xml

@@ -104,28 +104,17 @@
           and b.is_confirm = 0
     </select>
 
-    <resultMap type="com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListVO" id="UserAdvanceListMap">
-        <result column="id" property="id"/>
-        <result column="brand_name" property="brandName"/>
-        <collection property="snList" ofType="com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListInfoVO">
-            <result column="create_time" property="createTime"/>
-            <result column="is_use_amount" property="isUseAmount"/>
-            <result column="pos_sn" property="posSn"/>
-            <result column="is_advance" property="isAdvance"/>
-            <result column="areas" property="areas"/>
-            <result column="machine_id" property="machineId"/>
-        </collection>
-    </resultMap>
-    <select id="advanceUserList" resultMap="UserAdvanceListMap">
+    <select id="advanceUserList" resultType="com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListVO">
         select a.id,
                a.brand_name,
+               a.brand_id,
                b.pos_sn,
                b.create_time,
                b.is_use_amount,
                b.is_advance,
                b.machine_id
-        from (select * from kxs_machine_advance where del_flag = 0 and to_user_id = #{userId}) a
-                 left join kxs_machine_advance_info b on a.id = b.order_id
+        from kxs_machine_advance a
+        left join kxs_machine_advance_info b on a.id = b.order_id
         where a.del_flag = 0
           and a.to_user_id = #{userId}
           and b.is_apply = 0