同步仓库数据库完成

修改训练营列表倒序

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CommonConstants.java

@@ -80,9 +80,15 @@ public interface CommonConstants {
 	String REQUEST_START_TIME = "REQUEST-START-TIME";
 
 	String KXS_USER_NUMBER_PREFIX = "K";
+
 	/**
 	 * KXS提现订单号前缀
 	 */
 	String KXS_WITHDRAWAL_PREFIX = "BC";
 
+	/**
+	 * KXS提现订单号前缀
+	 */
+	String KXS_WAREHOUSE_APPLY_PREFIX = "FC";
+
 }

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/StateTypeEnum.java

@@ -1,27 +0,0 @@
-package com.kxs.common.core.constant.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 统计存储类型
- *
- * @author Lxq
- * @date 2023-10-25
- */
-@Getter
-@AllArgsConstructor
-public enum StateTypeEnum {
-
-
-    /**
-     * 统计存储类型
-     */
-    day(0, "天"),
-    month(1, "月");
-
-
-    private final Integer type;
-
-    private final String description;
-}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsToForAmount.java → kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsActTotal.java

@@ -15,14 +15,14 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 客小爽仓库临额充值表(KxsToForAmount)表实体类
+ * 客小爽仓库激活统计表(KxsActTotal)表实体类
  *
  * @author 系统
- * @since 2024-01-08 09:46:02
+ * @since 2024-04-16 15:35:17
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class KxsToForAmount extends Model<KxsToForAmount> implements Serializable {
+public class KxsActTotal extends Model<KxsActTotal> implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -57,7 +57,7 @@ public class KxsToForAmount extends Model<KxsToForAmount> implements Serializabl
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private String delFlag;
+    private Integer delFlag;
 
 
     /**
@@ -68,45 +68,38 @@ public class KxsToForAmount extends Model<KxsToForAmount> implements Serializabl
 
 
     /**
-     * 充值额度
+     * 统计日期 202311/20231101格式
      */
-    @Schema(description = "充值额度")
-    private BigDecimal amount;
-
+    @Schema(description = "统计日期 202311/20231101格式")
+    private Integer totalDate;
 
     /**
-     * 付款金额
+     * 统计月 202311/20231101格式
      */
-    @Schema(description = "付款金额")
-    private BigDecimal payAmount;
+    @Schema(description = "统计月 202311/20231101格式")
+    private Integer totalMonth;
 
 
     /**
-     * 支付渠道 0余额 1支付宝
+     * 仓库ID
      */
-    @Schema(description = "支付渠道 0余额 1支付宝")
-    private Integer payType;
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
 
 
     /**
-     * 状态 0未支付 1已支付 2取消订单
+     * 激活数量
      */
-    @Schema(description = "状态 0未支付 1已支付 2取消订单")
-    private Integer status;
-
+    @Schema(description = "激活数量")
+    private Integer totalNum;
 
-    /**
-     * 充值类型 0分仓充值 1小分仓充值
-     */
-    @Schema(description = "充值类型 0分仓充值 1小分仓充值")
-    private Integer forType;
 
 
     /**
-     * 商城订单id
+     * 品牌id
      */
-    @Schema(description = "商城订单id")
-    private Integer orderId;
+    @Schema(description = "品牌id")
+    private Integer brandId;
 
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsSendTotal.java

@@ -72,6 +72,12 @@ public class KxsSendTotal extends Model<KxsSendTotal> implements Serializable {
     @Schema(description = "统计日期 202311格式")
     private Integer totalDate;
 
+    /**
+     * 统计月 202311格式
+     */
+    @Schema(description = "统计月 202311格式")
+    private Integer totalMonth;
+
 
     /**
      * 仓库ID
@@ -87,13 +93,6 @@ public class KxsSendTotal extends Model<KxsSendTotal> implements Serializable {
     private Integer totalNum;
 
 
-    /**
-     * 统计类型 0天 1月
-     */
-    @Schema(description = "统计类型 0天 1月")
-    private Integer totalType;
-
-
     /**
      * 品牌id
      */

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseLimitLog.java

@@ -0,0 +1,141 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseLimitLog extends Model<KxsWarehouseLimitLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 创客ID
+     */
+    @Schema(description = "创客ID")
+    private Integer userId;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 使用额度
+     */
+    @Schema(description = "使用额度")
+    private BigDecimal useAmount;
+
+
+    /**
+     * 使用前额度
+     */
+    @Schema(description = "使用前额度")
+    private BigDecimal beforeAmount;
+
+
+    /**
+     * 操作类型 固定额度=0 临时额度=1
+     */
+    @Schema(description = "操作类型 固定额度=0 临时额度=1")
+    private Integer changeType;
+
+    /**
+     * 支付方式 支付宝=1 余额=3
+     */
+    @Schema(description = "支付方式 支付宝=1 余额=3")
+    private Integer payMode;
+
+
+    /**
+     * 额度类型 购买临时额度 = 1 增减分仓临时额度= 调低额度返回余额=3 仓库发货预发机申请=4
+     */
+    @Schema(description = "额度类型 购买临时额度 = 1 增减分仓临时额度= 调低额度返回余额=3 仓库发货预发机申请=4")
+    private Integer limitType;
+
+
+    /**
+     * 操作增减 add or sub
+     */
+    @Schema(description = "操作增减 add or sub")
+    private String kind;
+
+
+    /**
+     * 商城订单id
+     */
+    @Schema(description = "商城订单id")
+    private Integer orderId;
+
+
+    /**
+     * 使用后额度
+     */
+    @Schema(description = "使用后额度")
+    private BigDecimal afterAmount;
+
+
+    /**
+     * 仓库类型 0 分仓  1 小分仓
+     */
+    @Schema(description = "仓库类型 0 分仓  1 小分仓")
+    private Integer warehouseType;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseLimitSmallLog.java

@@ -0,0 +1,141 @@
+package com.kxs.store.api.model;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 客小爽小分仓额度变动记录(KxsWarehouseLimitLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseLimitSmallLog extends Model<KxsWarehouseLimitSmallLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 创客ID
+     */
+    @Schema(description = "创客ID")
+    private Integer userId;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 使用额度
+     */
+    @Schema(description = "使用额度")
+    private BigDecimal useAmount;
+
+
+    /**
+     * 使用前额度
+     */
+    @Schema(description = "使用前额度")
+    private BigDecimal beforeAmount;
+
+
+    /**
+     * 操作类型 固定额度=0 临时额度=1
+     */
+    @Schema(description = "操作类型 固定额度=0 临时额度=1")
+    private Integer changeType;
+
+    /**
+     * 支付方式 支付宝=1 余额=3
+     */
+    @Schema(description = "支付方式 支付宝=1 余额=3")
+    private Integer payMode;
+
+
+    /**
+     * 额度类型 购买临时额度 = 1 增减分仓临时额度= 调低额度返回余额=3 仓库发货预发机申请=4
+     */
+    @Schema(description = "额度类型 购买临时额度 = 1 增减分仓临时额度= 调低额度返回余额=3 仓库发货预发机申请=4")
+    private Integer limitType;
+
+
+    /**
+     * 操作增减 add or sub
+     */
+    @Schema(description = "操作增减 add or sub")
+    private String kind;
+
+
+    /**
+     * 商城订单id
+     */
+    @Schema(description = "商城订单id")
+    private Integer orderId;
+
+
+    /**
+     * 使用后额度
+     */
+    @Schema(description = "使用后额度")
+    private BigDecimal afterAmount;
+
+
+    /**
+     * 仓库类型 0 分仓  1 小分仓
+     */
+    @Schema(description = "仓库类型 0 分仓  1 小分仓")
+    private Integer warehouseType;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseMachineApply.java

@@ -132,7 +132,13 @@ public class KxsWarehouseMachineApply extends Model<KxsWarehouseMachineApply> im
      * 快递单号
      */
     @Schema(description = "快递单号")
-    private String trackNo;
+    private String erpNo;
+
+    /**
+     * 快递
+     */
+    @Schema(description = "快递")
+    private String erpName;
 
 
     /**
@@ -142,6 +148,13 @@ public class KxsWarehouseMachineApply extends Model<KxsWarehouseMachineApply> im
     private String remark;
 
 
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String updateBy;
+
+
     /**
      * 状态 0待配货 1已发货 2已驳回
      */

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseStockLog.java

@@ -88,9 +88,9 @@ public class KxsWarehouseStockLog extends Model<KxsWarehouseStockLog> implements
 
 
     /**
-     * 变动类型 0入库 1出库 2调拨
+     * 变动类型 采购=0 调拨=1 出货=2 退货=3
      */
-    @Schema(description = "变动类型 0入库 1出库 2调拨")
+    @Schema(description = "变动类型 采购=0 调拨=1 出货=2 退货=3")
     private Integer changeType;
 
 

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

@@ -0,0 +1,17 @@
+package com.kxs.store.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsActTotal;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽仓库激活统计表(KxsActTotal)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 15:35:17
+ */
+@Mapper
+public interface KxsActTotalMapper extends BaseMapper<KxsActTotal> {
+
+}
+

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

@@ -1,17 +0,0 @@
-package com.kxs.store.biz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kxs.store.api.model.KxsToForAmount;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 客小爽仓库临额充值表(KxsToForAmount)表数据库访问层
- *
- * @author 系统
- * @since 2024-01-08 09:46:02
- */
-@Mapper
-public interface KxsToForAmountMapper extends BaseMapper<KxsToForAmount> {
-
-}
-

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

@@ -0,0 +1,17 @@
+package com.kxs.store.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Mapper
+public interface KxsWarehouseLimitLogMapper extends BaseMapper<KxsWarehouseLimitLog> {
+
+}
+

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

@@ -0,0 +1,17 @@
+package com.kxs.store.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseLimitSmallLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽小分仓额度变动记录(KxsWarehouseLimitLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Mapper
+public interface KxsWarehouseLimitSmallLogMapper extends BaseMapper<KxsWarehouseLimitSmallLog> {
+
+}
+

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

@@ -0,0 +1,15 @@
+package com.kxs.store.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.store.api.model.KxsActTotal;
+
+/**
+ * 客小爽仓库激活统计表(KxsActTotal)表服务接口
+ *
+ * @author 系统
+ * @since 2024-04-16 15:35:17
+ */
+public interface KxsActTotalService extends IService<KxsActTotal> {
+
+}
+

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

@@ -1,15 +0,0 @@
-package com.kxs.store.biz.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.kxs.store.api.model.KxsToForAmount;
-
-/**
- * 客小爽仓库临额充值表(KxsToForAmount)表服务接口
- *
- * @author 系统
- * @since 2024-01-08 09:46:02
- */
-public interface KxsToForAmountService extends IService<KxsToForAmount> {
-
-}
-

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

@@ -0,0 +1,25 @@
+package com.kxs.store.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+public interface KxsWarehouseLimitLogService extends IService<KxsWarehouseLimitLog> {
+
+
+
+    /**
+     * 动态调用分仓/小分仓
+     * @param type 0分仓 1小分仓
+     * @return true/false
+     */
+    default boolean support(Integer type){
+        return Boolean.TRUE;
+    }
+}
+

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

@@ -0,0 +1,19 @@
+package com.kxs.store.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.biz.mapper.KxsActTotalMapper;
+import com.kxs.store.api.model.KxsActTotal;
+import com.kxs.store.biz.service.KxsActTotalService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽仓库激活统计表(KxsActTotal)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-16 15:35:17
+ */
+@Service("kxsActTotalService")
+public class KxsActTotalServiceImpl extends ServiceImpl<KxsActTotalMapper, KxsActTotal> implements KxsActTotalService {
+
+}
+

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

@@ -2,10 +2,9 @@ package com.kxs.store.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kxs.common.core.constant.enums.StateTypeEnum;
 import com.kxs.common.core.util.TotalDateUtil;
-import com.kxs.store.biz.mapper.KxsSendTotalMapper;
 import com.kxs.store.api.model.KxsSendTotal;
+import com.kxs.store.biz.mapper.KxsSendTotalMapper;
 import com.kxs.store.biz.service.KxsSendTotalService;
 import org.springframework.stereotype.Service;
 
@@ -25,15 +24,17 @@ public class KxsSendTotalServiceImpl extends ServiceImpl<KxsSendTotalMapper, Kxs
 
         //日统计
         Integer dateNumber = TotalDateUtil.getDateNumber(LocalDate.now());
+        //月统计
+        Integer monthNumber = TotalDateUtil.getMonthNumber(LocalDate.now());
         KxsSendTotal dateTotal = baseMapper.selectOne(Wrappers.lambdaQuery(KxsSendTotal.class)
                 .eq(KxsSendTotal::getTotalDate, dateNumber)
-                .eq(KxsSendTotal::getTotalType, StateTypeEnum.day.getType())
+                .eq(KxsSendTotal::getTotalMonth, monthNumber)
                 .eq(KxsSendTotal::getBrandId, brandId)
                 .eq(KxsSendTotal::getWarehouseId, warehouseId));
         if (dateTotal == null) {
             dateTotal = new KxsSendTotal();
             dateTotal.setTotalDate(dateNumber);
-            dateTotal.setTotalType(StateTypeEnum.day.getType());
+            dateTotal.setTotalMonth(monthNumber);
             dateTotal.setBrandId(brandId);
             dateTotal.setWarehouseId(warehouseId);
             dateTotal.setTotalNum(count);
@@ -43,25 +44,6 @@ public class KxsSendTotalServiceImpl extends ServiceImpl<KxsSendTotalMapper, Kxs
             baseMapper.updateById(dateTotal);
         }
 
-        //月统计
-        Integer monthNumber = TotalDateUtil.getMonthNumber(LocalDate.now());
-        KxsSendTotal monthTotal = baseMapper.selectOne(Wrappers.lambdaQuery(KxsSendTotal.class)
-                .eq(KxsSendTotal::getTotalDate, monthNumber)
-                .eq(KxsSendTotal::getTotalType, StateTypeEnum.month.getType())
-                .eq(KxsSendTotal::getBrandId, brandId)
-                .eq(KxsSendTotal::getWarehouseId, warehouseId));
-        if (monthTotal == null){
-            monthTotal = new KxsSendTotal();new KxsSendTotal();
-            monthTotal.setTotalDate(monthNumber);
-            monthTotal.setTotalType(StateTypeEnum.month.getType());
-            monthTotal.setBrandId(brandId);
-            monthTotal.setWarehouseId(warehouseId);
-            monthTotal.setTotalNum(count);
-            baseMapper.insert(monthTotal);
-        } else {
-            monthTotal.setTotalNum(monthTotal.getTotalNum() + count);
-            baseMapper.updateById(monthTotal);
-        }
     }
 }
 

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

@@ -1,19 +0,0 @@
-package com.kxs.store.biz.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kxs.store.biz.mapper.KxsToForAmountMapper;
-import com.kxs.store.api.model.KxsToForAmount;
-import com.kxs.store.biz.service.KxsToForAmountService;
-import org.springframework.stereotype.Service;
-
-/**
- * 客小爽仓库临额充值表(KxsToForAmount)表服务实现类
- *
- * @author 系统
- * @since 2024-01-08 09:46:02
- */
-@Service("kxsToForAmountService")
-public class KxsToForAmountServiceImpl extends ServiceImpl<KxsToForAmountMapper, KxsToForAmount> implements KxsToForAmountService {
-
-}
-

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

@@ -0,0 +1,28 @@
+package com.kxs.store.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
+import com.kxs.store.biz.mapper.KxsWarehouseLimitLogMapper;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import com.kxs.store.biz.service.KxsWarehouseLimitLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Service("kxsWarehouseLimitLogService")
+public class KxsWarehouseLimitLogServiceImpl extends ServiceImpl<KxsWarehouseLimitLogMapper, KxsWarehouseLimitLog> implements KxsWarehouseLimitLogService {
+
+
+    @Override
+    public boolean support(Integer type) {
+
+        return Objects.equals(WarehouseLimitTypeEnum.FC.getType(), type);
+    }
+}
+

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

@@ -1,6 +1,7 @@
 package com.kxs.store.biz.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.SecurityConstants;
@@ -21,6 +22,7 @@ import com.kxs.store.biz.mapper.KxsMachineAdvanceMapper;
 import com.kxs.store.biz.mapper.KxsWarehouseCreditAmountMapper;
 import com.kxs.store.biz.mapper.KxsWarehouseLimitMapper;
 import com.kxs.store.api.model.KxsWarehouseLimit;
+import com.kxs.store.biz.service.KxsWarehouseLimitLogService;
 import com.kxs.store.biz.service.KxsWarehouseLimitService;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
@@ -31,7 +33,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 客小爽仓库额度表(KxsWarehouseLimit)表服务实现类
@@ -53,6 +57,7 @@ public class KxsWarehouseLimitServiceImpl extends ServiceImpl<KxsWarehouseLimitM
     @Override
     public AdvanceUserDetailVO getUserDetail(String userCode, BigDecimal amount) {
 
+
         AdvanceUserDetailVO advanceUserDetailVO = new AdvanceUserDetailVO();
 
         R<KxsUser> kxsUserR = remoteKxsUserService.loadUserByCode(userCode, SecurityConstants.FROM_IN);

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

@@ -0,0 +1,27 @@
+package com.kxs.store.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
+import com.kxs.store.biz.mapper.KxsWarehouseLimitLogMapper;
+import com.kxs.store.biz.service.KxsWarehouseLimitLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Service("kxsWarehouseLimitLogService")
+public class KxsWarehouseLimitSmallLogServiceImpl extends ServiceImpl<KxsWarehouseLimitLogMapper, KxsWarehouseLimitLog> implements KxsWarehouseLimitLogService {
+
+    @Override
+    public boolean support(Integer type) {
+
+        return Objects.equals(WarehouseLimitTypeEnum.XFC.getType(), type);
+    }
+}
+

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.constant.enums.BrandTypeEnum;
 import com.kxs.common.core.constant.enums.ErrorTypeEnum;
@@ -103,11 +104,11 @@ public class KxsWarehouseMachineApplyServiceImpl extends ServiceImpl<KxsWarehous
 
         KxsWarehouseMachineApply kxsWarehouseMachineApply = new KxsWarehouseMachineApply();
         kxsWarehouseMachineApply.setUserId(userId.intValue());
-        kxsWarehouseMachineApply.setOrderSn("FC" + orderSn);
+        kxsWarehouseMachineApply.setOrderSn(CommonConstants.KXS_WAREHOUSE_APPLY_PREFIX + orderSn);
         kxsWarehouseMachineApply.setApplyNum(param.getApplyNum());
         kxsWarehouseMachineApply.setUsername(user.getUsername());
         kxsWarehouseMachineApply.setUserCode(user.getUserCode());
-        kxsWarehouseMachineApply.setApplyData(JSON.toJSONString(param.getApplyData()));
+        kxsWarehouseMachineApply.setApplyData(JSON.toJSONString(applyData));
         kxsWarehouseMachineApply.setUseAmount(useAmount);
         baseMapper.insert(kxsWarehouseMachineApply);
 

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.store.biz.mapper.KxsActTotalMapper">
+
+    <resultMap type="com.kxs.store.api.model.KxsActTotal" id="KxsActTotalMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="total_date" property="totalDate" />
+        <result column="total_month" property="totalMonth" />
+        <result column="warehouse_id" property="warehouseId" />
+        <result column="total_num" property="totalNum" />
+        <result column="brand_id" property="brandId" />
+
+    </resultMap>
+
+</mapper>

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

@@ -9,9 +9,9 @@
         <result column="del_flag" property="delFlag" />
         <result column="version" property="version" />
         <result column="total_date" property="totalDate" />
+        <result column="total_month" property="totalMonth" />
         <result column="warehouse_id" property="warehouseId" />
         <result column="total_num" property="totalNum" />
-        <result column="total_type" property="totalType" />
         <result column="brand_id" property="brandId" />
 
     </resultMap>

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kxs.store.biz.mapper.KxsToForAmountMapper">
-
-    <resultMap type="com.kxs.store.api.model.KxsToForAmount" id="KxsToForAmountMap">
-        <result column="id" property="id" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="del_flag" property="delFlag" />
-        <result column="version" property="version" />
-        <result column="amount" property="amount" />
-        <result column="pay_amount" property="payAmount" />
-        <result column="pay_type" property="payType" />
-        <result column="status" property="status" />
-        <result column="for_type" property="forType" />
-        <result column="order_id" property="orderId" />
-
-    </resultMap>
-
-</mapper>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.store.biz.mapper.KxsWarehouseLimitLogMapper">
+
+    <resultMap type="com.kxs.store.api.model.KxsWarehouseLimitLog" id="KxsWarehouseLimitLogMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="use_amount" property="useAmount" />
+        <result column="before_amount" property="beforeAmount" />
+        <result column="change_type" property="changeType" />
+        <result column="limit_type" property="limitType" />
+        <result column="pay_mode" property="payMode" />
+        <result column="kind" property="kind" />
+        <result column="order_id" property="orderId" />
+        <result column="after_amount" property="afterAmount" />
+        <result column="warehouse_type" property="warehouseType" />
+
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.store.biz.mapper.KxsWarehouseLimitSmallLogMapper">
+
+    <resultMap type="com.kxs.store.api.model.KxsWarehouseLimitSmallLog" id="KxsWarehouseLimitSmallLogMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="use_amount" property="useAmount" />
+        <result column="before_amount" property="beforeAmount" />
+        <result column="change_type" property="changeType" />
+        <result column="limit_type" property="limitType" />
+        <result column="pay_mode" property="payMode" />
+        <result column="kind" property="kind" />
+        <result column="order_id" property="orderId" />
+        <result column="after_amount" property="afterAmount" />
+        <result column="warehouse_type" property="warehouseType" />
+
+    </resultMap>
+
+</mapper>

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

@@ -17,8 +17,10 @@
         <result column="username" property="username" />
         <result column="user_code" property="userCode" />
         <result column="get_mode" property="getMode" />
-        <result column="track_no" property="trackNo" />
+        <result column="erp_no" property="erpNo" />
+        <result column="erp_name" property="erpName" />
         <result column="remark" property="remark" />
+        <result column="update_by" property="updateBy" />
         <result column="status" property="status" />
 
     </resultMap>

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysMenuController.java

@@ -38,7 +38,7 @@ public class SysMenuController {
 	 * @param parentId 父节点ID
 	 * @return 当前用户的树形菜单
 	 */
-	@GetMapping
+	@GetMapping("/getUserMenu")
 	public R getUserMenu(String type, Long parentId) {
 		// 获取符合条件的菜单
 		Set<SysMenu> all = new HashSet<>();

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampMapper.xml

@@ -35,6 +35,7 @@
             a.del_flag = 0
             and (b.user_id =  #{userId} or a.create_user_id = #{userId})
         </where>
+        order by id desc
     </select>
     <select id="selectByUserId" resultType="com.kxs.system.api.model.KxsCampUser">
         SELECT a.id, a.status, a.camp_num, a.camp_type, a.pic_url, a.title

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kxs.product.api.model.KxsMerchant;
 import com.kxs.store.api.model.KxsMachineAdvance;
 import com.kxs.store.api.model.KxsMachineApply;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import com.kxs.store.api.model.KxsWarehouseStockLog;
 import com.kxs.system.api.model.KxsSchoolStudy;
 import com.kxs.transfer.api.annotation.DtsMsgListener;
 import com.kxs.transfer.api.mapper.user.KxsUserByStageMapper;
@@ -19,8 +21,7 @@ import com.kxs.transfer.api.service.product.impl.KxsMachineTrackService;
 import com.kxs.transfer.api.service.product.impl.KxsShopOrderService;
 import com.kxs.transfer.api.service.store.KxsMachineRecycleService;
 import com.kxs.transfer.api.service.store.KxsWarehouseService;
-import com.kxs.transfer.api.service.store.impl.KxsMachineAdvanceService;
-import com.kxs.transfer.api.service.store.impl.KxsMachineApplyService;
+import com.kxs.transfer.api.service.store.impl.*;
 import com.kxs.transfer.api.service.sys.KxsMorningLogService;
 import com.kxs.transfer.api.service.sys.KxsMorningService;
 import com.kxs.transfer.api.service.sys.KxsSchoolStudyService;
@@ -89,6 +90,10 @@ public class DtsController {
     private final KxsMachineRecycleService kxsMachineRecycleService;
     private final KxsMachineApplyService kxsMachineApplyService;
     private final KxsMachineAdvanceService kxsMachineAdvanceService;
+    private final KxsWarehouseMachineApplyService kxsWarehouseMachineApplyService;
+    private final KxsWarehouseStockLogService kxsWarehouseStockLogService;
+    private final KxsWarehouseLimitLogService kxsWarehouseLimitLogService;
+    private final KxsActTotalService kxsActTotalService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -281,10 +286,30 @@ public class DtsController {
             if ("PreSendStockDetail".equals(dmlData.getTableName())) {
                 kxsMachineAdvanceService.changeData(dmlData);
             }
+            //分仓机具申请表
+            if ("StoreMachineApply".equals(dmlData.getTableName())) {
+                kxsWarehouseMachineApplyService.changeData(dmlData);
+            }
             //仓库担保记录
             if ("StoreHouseAmountPromiss".equals(dmlData.getTableName())) {
                 kxsWarehouseService.changeCreditData(dmlData);
             }
+            //仓库库存变动记录表
+            if ("StoreBalance".equals(dmlData.getTableName())) {
+                kxsWarehouseStockLogService.changeData(dmlData);
+            }
+            //仓库额度变动记录表
+            if ("StoreHouseAmountRecord".equals(dmlData.getTableName())) {
+                kxsWarehouseLimitLogService.changeData(dmlData);
+            }
+            //小分仓额度变动记录表
+            if ("PreAmountRecord".equals(dmlData.getTableName())) {
+                kxsWarehouseLimitLogService.changeSmallData(dmlData);
+            }
+            //仓库激活统计表
+            if ("StoreSnActivateSummary".equals(dmlData.getTableName())) {
+                kxsActTotalService.changeData(dmlData);
+            }
             //仓库额度表
             if ("UserAccount".equals(dmlData.getTableName()) && ("dev".equals(active) || "test".equals(active) ? "KxsMainServer":"KxsProfitServer").equals(dmlData.getDatabaseName())) {
                 kxsWarehouseService.changeAccountData(dmlData);

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsActTotalMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsActTotal;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽仓库激活统计表(KxsActTotal)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 15:35:17
+ */
+@Mapper
+@DS("store")
+public interface KxsActTotalMapper extends BaseMapper<KxsActTotal> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseLimitLogMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Mapper
+@DS("store")
+public interface KxsWarehouseLimitLogMapper extends BaseMapper<KxsWarehouseLimitLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseLimitSmallLogMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseLimitSmallLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽小分仓额度变动记录(KxsWarehouseLimitLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Mapper
+@DS("store")
+public interface KxsWarehouseLimitSmallLogMapper extends BaseMapper<KxsWarehouseLimitSmallLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseMachineApplyDetailMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseMachineApplyDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽分仓申请补货订单详情表(KxsWarehouseMachineApplyDetail)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:03
+ */
+@Mapper
+@DS("store")
+public interface KxsWarehouseMachineApplyDetailMapper extends BaseMapper<KxsWarehouseMachineApplyDetail> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseMachineApplyMapper.java

@@ -0,0 +1,23 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+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.store.api.model.KxsWarehouseMachineApply;
+import com.kxs.store.api.vo.kxsapp.storeLimit.WarehouseMachineApplyListVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 客小爽分仓申请补货订单表(KxsWarehouseMachineApply)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@Mapper
+@DS("store")
+public interface KxsWarehouseMachineApplyMapper extends BaseMapper<KxsWarehouseMachineApply> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseStockLogMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.store;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.store.api.model.KxsWarehouseStockLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽仓库库存变动记录表(KxsWarehouseStockLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@Mapper
+@DS("store")
+public interface KxsWarehouseStockLogMapper extends BaseMapper<KxsWarehouseStockLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsActTotalService.java

@@ -0,0 +1,71 @@
+package com.kxs.transfer.api.service.store.impl;
+
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.api.model.KxsActTotal;
+import com.kxs.transfer.api.mapper.store.KxsActTotalMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客小爽仓库激活统计表(KxsActTotal)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-16 15:35:17
+ */
+@Service("kxsActTotalService")
+public class KxsActTotalService extends ServiceImpl<KxsActTotalMapper, KxsActTotal>  {
+
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsActTotal actTotal = new KxsActTotal();
+        actTotal.setId(id);
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "StoreId":
+                    actTotal.setWarehouseId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BrandId":
+                    actTotal.setBrandId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ActivateNum":
+                    actTotal.setTotalNum(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "TradeMonth":
+                    actTotal.setTotalMonth(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "TradeDate":
+                    actTotal.setTotalDate(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.INSERT)){
+            KxsActTotal kxsActTotal = baseMapper.selectById(id);
+            if(kxsActTotal == null){
+                baseMapper.insert(actTotal);
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+            baseMapper.updateById(actTotal);
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsWarehouseLimitLogService.java

@@ -0,0 +1,174 @@
+package com.kxs.transfer.api.service.store.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.api.model.KxsWarehouseLimitLog;
+import com.kxs.store.api.model.KxsWarehouseLimitSmallLog;
+import com.kxs.transfer.api.mapper.store.KxsWarehouseLimitLogMapper;
+import com.kxs.transfer.api.mapper.store.KxsWarehouseLimitSmallLogMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客小爽仓库额度变动记录(KxsWarehouseLimitLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-16 14:50:16
+ */
+@Service("kxsWarehouseLimitLogService")
+@RequiredArgsConstructor
+public class KxsWarehouseLimitLogService extends ServiceImpl<KxsWarehouseLimitLogMapper, KxsWarehouseLimitLog> {
+
+    private final KxsWarehouseLimitSmallLogMapper kxsWarehouseLimitSmallLogMapper;
+    public void changeData(DMLData dmlData) {
+
+
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsWarehouseLimitLog warehouseLimitLog = new KxsWarehouseLimitLog();
+        warehouseLimitLog.setId(id);
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    warehouseLimitLog.setUserId(userId);
+                    break;
+                case "UseAmount":
+                    warehouseLimitLog.setUseAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeAmount":
+                    warehouseLimitLog.setBeforeAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterAmount":
+                    warehouseLimitLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AmountType":
+                    warehouseLimitLog.setChangeType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "QueryCount":
+                    warehouseLimitLog.setOrderId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Sort":
+                    warehouseLimitLog.setLimitType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "PayMode":
+                    warehouseLimitLog.setPayMode(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "OperateType":
+                    int kind = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    warehouseLimitLog.setKind(kind == 0 ? "sub" : "add");
+                    break;
+                case "CreateDate":
+                    warehouseLimitLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    warehouseLimitLog.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.INSERT)){
+            KxsWarehouseLimitLog kxsWarehouseLimitLog = baseMapper.selectById(id);
+            if(kxsWarehouseLimitLog == null){
+                baseMapper.insert(warehouseLimitLog);
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+
+            baseMapper.updateById(warehouseLimitLog);
+        }
+    }
+
+    public void changeSmallData(DMLData dmlData) {
+
+
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsWarehouseLimitSmallLog warehouseLimitLog = new KxsWarehouseLimitSmallLog();
+        warehouseLimitLog.setId(id);
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    warehouseLimitLog.setUserId(userId);
+                    break;
+                case "UseAmount":
+                    warehouseLimitLog.setUseAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeAmount":
+                    warehouseLimitLog.setBeforeAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterAmount":
+                    warehouseLimitLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AmountType":
+                    warehouseLimitLog.setChangeType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "QueryCount":
+                    warehouseLimitLog.setOrderId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Sort":
+                    warehouseLimitLog.setLimitType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "PayMode":
+                    warehouseLimitLog.setPayMode(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "OperateType":
+                    int kind = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    warehouseLimitLog.setKind(kind == 0 ? "sub" : "add");
+                    break;
+                case "CreateDate":
+                    warehouseLimitLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    warehouseLimitLog.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.INSERT)){
+            KxsWarehouseLimitSmallLog kxsWarehouseLimitLog = kxsWarehouseLimitSmallLogMapper.selectById(id);
+            if(kxsWarehouseLimitLog == null){
+                kxsWarehouseLimitSmallLogMapper.insert(warehouseLimitLog);
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+
+            kxsWarehouseLimitSmallLogMapper.updateById(warehouseLimitLog);
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsWarehouseMachineApplyService.java

@@ -0,0 +1,182 @@
+package com.kxs.transfer.api.service.store.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.api.model.KxsBrand;
+import com.kxs.product.api.model.KxsMachine;
+import com.kxs.store.api.model.*;
+import com.kxs.system.api.model.SysUserRole;
+import com.kxs.transfer.api.mapper.product.KxsBrandMapper;
+import com.kxs.transfer.api.mapper.product.KxsMachineMapper;
+import com.kxs.transfer.api.mapper.store.KxsWarehouseMachineApplyDetailMapper;
+import com.kxs.transfer.api.mapper.store.KxsWarehouseMachineApplyMapper;
+import com.kxs.transfer.api.mapper.user.KxsUserMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
+import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.model.KxsUserAdvance;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 客小爽分仓申请补货订单表(KxsWarehouseMachineApply)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@Service("kxsWarehouseMachineApplyService")
+@RequiredArgsConstructor
+public class KxsWarehouseMachineApplyService extends ServiceImpl<KxsWarehouseMachineApplyMapper, KxsWarehouseMachineApply> {
+
+    private final KxsUserMapper kxsUserMapper;
+
+    private final KxsBrandMapper kxsBrandMapper;
+
+    private final KxsWarehouseMachineApplyDetailMapper kxsWarehouseMachineApplyDetailMapper;
+
+    private final KxsMachineMapper kxsMachineMapper;
+
+    public void changeData(DMLData dmlData) {
+
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsWarehouseMachineApply warehouseMachineApply = new KxsWarehouseMachineApply();
+
+        ArrayList<KxsWarehouseMachineApplyDetail> machineApplyDetails = new ArrayList<>();
+
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        if (operation.equals(OperationType.DELETE)) {
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    KxsUser user = kxsUserMapper.selectById(userId);
+                    Optional.ofNullable(user).ifPresent(t -> {
+                            warehouseMachineApply.setUserId(userId);
+                            warehouseMachineApply.setUsername(user.getUsername());
+                            warehouseMachineApply.setUserCode(user.getUserCode());
+                        }
+                    );
+                    break;
+                case "ApplyNum":
+                    warehouseMachineApply.setApplyNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "SendSn":
+                    List<JSONObject> applyData = new ArrayList<>();
+                    String applyJson = validFieldDataMap.get(field).toString();
+                    JSONArray parse = JSON.parseArray(applyJson);
+                    for (Object data : parse) {
+                        JSONObject jsonObject = (JSONObject) data;
+                        JSONObject apply = new JSONObject();
+                        Integer brandId = jsonObject.getInteger("BrandId");
+                        KxsBrand brand = kxsBrandMapper.selectById(brandId);
+                        apply.put("number", jsonObject.getInteger("ApplyNum"));
+                        apply.put("brandId", jsonObject.getInteger("BrandId"));
+                        apply.put("brandName", brand.getName());
+                        applyData.add(apply);
+                    }
+                    warehouseMachineApply.setApplyData(JSON.toJSONString(applyData));
+                    break;
+                case "SeoDescription":
+                    Optional.ofNullable(fieldDataMap.get("SeoDescription").getValue()).ifPresent(t -> {
+                        Map<Integer, String> applyDatas = new HashMap<>();
+                        String applyJsonStr =  fieldDataMap.get("SendSn").getValue().toString();
+                        JSONArray applyJsons = JSON.parseArray(applyJsonStr);
+                        for (Object data : applyJsons) {
+                            JSONObject jsonObject = (JSONObject) data;
+                            Integer brandId = jsonObject.getInteger("BrandId");
+                            KxsBrand brand = kxsBrandMapper.selectById(brandId);
+                            applyDatas.put(brandId, brand.getName());
+                        }
+
+                        String sns = fieldDataMap.get("SeoDescription").getValue().toString();
+                        String[] split = sns.split(StrUtil.COMMA);
+                        for (String sn : split) {
+                            KxsWarehouseMachineApplyDetail machineApplyDetail = new KxsWarehouseMachineApplyDetail();
+                            KxsMachine kxsMachine = kxsMachineMapper.selectOne(Wrappers.<KxsMachine>lambdaQuery().eq(KxsMachine::getPosSn, sn));
+                            Optional.ofNullable(kxsMachine).ifPresent(item -> {
+                                machineApplyDetail.setPosSn(item.getPosSn());
+                                machineApplyDetail.setBrandId(item.getBrandId());
+                                machineApplyDetail.setOrderId(id);
+                                machineApplyDetail.setBrandName(applyDatas.get(item.getBrandId()));
+                                machineApplyDetails.add(machineApplyDetail);
+                            });
+                        }
+                    });
+                    break;
+                case "ApplyNo":
+                    warehouseMachineApply.setOrderSn(validFieldDataMap.get(field).toString());
+                    break;
+                case "SendNum":
+                    warehouseMachineApply.setSendNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "UseAmount":
+                    warehouseMachineApply.setUseAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ErpCode":
+                    warehouseMachineApply.setErpNo(validFieldDataMap.get(field).toString());
+                    break;
+                case "SendMode":
+                    warehouseMachineApply.setErpName(validFieldDataMap.get(field).toString());
+                    break;
+                case "SeoKeyword":
+                    warehouseMachineApply.setRemark(validFieldDataMap.get(field).toString());
+                    break;
+                case "Status":
+                    warehouseMachineApply.setStatus(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "SeoTitle":
+                    warehouseMachineApply.setUpdateBy(validFieldDataMap.get(field).toString());
+                    break;
+                case "CreateDate":
+                    warehouseMachineApply.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    warehouseMachineApply.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+        if (operation.equals(OperationType.UPDATE)) {
+            warehouseMachineApply.setId(id);
+            baseMapper.updateById(warehouseMachineApply);
+            if (!machineApplyDetails.isEmpty()) {
+                kxsWarehouseMachineApplyDetailMapper.delete(Wrappers.<KxsWarehouseMachineApplyDetail>lambdaQuery().eq(KxsWarehouseMachineApplyDetail::getOrderId, id));
+                for (KxsWarehouseMachineApplyDetail machineApplyDetail : machineApplyDetails) {
+                    kxsWarehouseMachineApplyDetailMapper.insert(machineApplyDetail);
+                }
+            }
+        }
+        if (operation.equals(OperationType.INSERT)) {
+            KxsWarehouseMachineApply kxsWarehouseMachineApply = baseMapper.selectById(id);
+            if (kxsWarehouseMachineApply == null) {
+                warehouseMachineApply.setId(id);
+                baseMapper.insert(warehouseMachineApply);
+            }
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsWarehouseStockLogService.java

@@ -0,0 +1,101 @@
+package com.kxs.transfer.api.service.store.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.store.api.model.KxsWarehouseStockLog;
+import com.kxs.transfer.api.mapper.store.KxsWarehouseStockLogMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客小爽仓库库存变动记录表(KxsWarehouseStockLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@Service("kxsWarehouseStockLogService")
+public class KxsWarehouseStockLogService extends ServiceImpl<KxsWarehouseStockLogMapper, KxsWarehouseStockLog> {
+
+    public void changeData(DMLData dmlData) {
+
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsWarehouseStockLog warehouseStockLog = new KxsWarehouseStockLog();
+        warehouseStockLog.setId(id);
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "StoreId":
+                    int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    warehouseStockLog.setWarehouseId(userId);
+                    break;
+                case "BrandId":
+                    warehouseStockLog.setBrandId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "OpStoreNum":
+                    warehouseStockLog.setChangeNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeTotalNum":
+                    warehouseStockLog.setBeforeStockTotal(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterTotalNum":
+                    warehouseStockLog.setAfterStockTotal(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeLaveNum":
+                    warehouseStockLog.setBeforeStockNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterLaveNum":
+                    warehouseStockLog.setAfterStockNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeOutNum":
+                    warehouseStockLog.setBeforeDeliveryNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterOutNum":
+                    warehouseStockLog.setAfterDeliveryNum(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "TransType":
+                    warehouseStockLog.setChangeType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "OpSymbol":
+                    String sub = validFieldDataMap.get(field).toString();
+                    warehouseStockLog.setKind("+".equals(sub) ? "add" : "sub");
+                    break;
+                case "CreateDate":
+                    warehouseStockLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    warehouseStockLog.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.INSERT)){
+            KxsWarehouseStockLog kxsWarehouseStockLog = baseMapper.selectById(id);
+            if(kxsWarehouseStockLog == null){
+                baseMapper.insert(warehouseStockLog);
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+
+            baseMapper.updateById(warehouseStockLog);
+        }
+    }
+}
+