Merge branch 'develop' into test-transfer

* develop:
  广电话费交易额统计同步

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/model/KxsUserGdTrade.java

@@ -0,0 +1,122 @@
+package com.kxs.stat.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;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表实体类
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserGdTrade extends Model<KxsUserGdTrade> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 交易日
+     */
+    @Schema(description = "交易日")
+    private Integer tradeDate;
+
+
+    /**
+     * 交易月
+     */
+    @Schema(description = "交易月")
+    private Integer tradeMonth;
+
+
+    /**
+     * 扶持期交易额
+     */
+    @Schema(description = "扶持期交易额")
+    private BigDecimal helpTradeAmt;
+
+
+    /**
+     * 商户ID
+     */
+    @Schema(description = "商户ID")
+    private Integer userId;
+
+
+    /**
+     * 稳定期交易额
+     */
+    @Schema(description = "稳定期交易额")
+    private BigDecimal proTradeAmt;
+
+
+    /**
+     * 交易额
+     */
+    @Schema(description = "交易额")
+    private BigDecimal tradeAmt;
+
+
+    /**
+     * 统计类型 0个人 1团队
+     */
+    @Schema(description = "统计类型 0个人 1团队")
+    private Integer totalType;
+
+
+
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/mapper/KxsUserGdTradeMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.stat.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.stat.api.model.KxsUserGdTrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+@Mapper
+public interface KxsUserGdTradeMapper extends BaseMapper<KxsUserGdTrade> {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/KxsUserGdTradeService.java

@@ -0,0 +1,15 @@
+package com.kxs.stat.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.stat.api.model.KxsUserGdTrade;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表服务接口
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+public interface KxsUserGdTradeService extends IService<KxsUserGdTrade> {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserGdTradeServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.stat.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.stat.biz.mapper.KxsUserGdTradeMapper;
+import com.kxs.stat.api.model.KxsUserGdTrade;
+import com.kxs.stat.biz.service.KxsUserGdTradeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+@Service("kxsUserGdTradeService")
+public class KxsUserGdTradeServiceImpl extends ServiceImpl<KxsUserGdTradeMapper, KxsUserGdTrade> implements KxsUserGdTradeService {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/resources/mapper/KxsUserGdTradeMapper.xml

@@ -0,0 +1,21 @@
+<?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.stat.biz.mapper.KxsUserGdTradeMapper">
+
+    <resultMap type="com.kxs.stat.api.model.KxsUserGdTrade" id="KxsUserGdTradeMap">
+        <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="trade_date" property="tradeDate" />
+        <result column="trade_month" property="tradeMonth" />
+        <result column="help_trade_amt" property="helpTradeAmt" />
+        <result column="user_id" property="userId" />
+        <result column="pro_trade_amt" property="proTradeAmt" />
+        <result column="trade_amt" property="tradeAmt" />
+        <result column="total_type" property="totalType" />
+
+    </resultMap>
+
+</mapper>

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

@@ -103,6 +103,7 @@ public class DtsController {
     private final KxsUserActTradeService kxsUserActTradeService;
     private final KxsMerchantTradeService kxsMerchantTradeService;
     private final KxsUserLogoutTradeService kxsUserLogoutTradeService;
+    private final KxsUserGdTradeService kxsUserGdTradeService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -380,6 +381,10 @@ public class DtsController {
             if ("UserSimActSummary".equals(dmlData.getTableName())) {
                 kxsUserLogoutTradeService.changeData(dmlData);
             }
+            //广电话费统计表
+            if ("SimCardDaySummary".equals(dmlData.getTableName())) {
+                kxsUserGdTradeService.changeData(dmlData);
+            }
 
 
 

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/stat/KxsUserGdTradeMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.stat;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.stat.api.model.KxsUserGdTrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+@Mapper
+@DS("stat")
+public interface KxsUserGdTradeMapper extends BaseMapper<KxsUserGdTrade> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/stat/KxsUserGdTradeService.java

@@ -0,0 +1,87 @@
+package com.kxs.transfer.api.service.stat;
+
+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.stat.api.model.KxsUserActTrade;
+import com.kxs.stat.api.model.KxsUserGdTrade;
+import com.kxs.stat.api.model.KxsUserLogoutTrade;
+import com.kxs.transfer.api.mapper.stat.KxsUserGdTradeMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 广电话费统计表(KxsUserGdTrade)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-05-13 15:21:35
+ */
+@Service("kxsUserGdTradeService")
+public class KxsUserGdTradeService extends ServiceImpl<KxsUserGdTradeMapper, KxsUserGdTrade> {
+
+    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());
+
+        KxsUserGdTrade userGdTrade = new KxsUserGdTrade();
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        if (fieldDataMap.get("UserId").getValue() != null) {
+            userGdTrade.setUserId(Integer.valueOf(fieldDataMap.get("UserId").getValue().toString()));
+        }
+        if (fieldDataMap.get("TradeMonth").getValue() != null) {
+            userGdTrade.setTradeMonth(Integer.valueOf(fieldDataMap.get("TradeMonth").getValue().toString()));
+        }
+        if (fieldDataMap.get("TradeDay").getValue() != null) {
+            userGdTrade.setTradeDate(Integer.valueOf(fieldDataMap.get("TradeDay").getValue().toString()));
+        }
+        if (fieldDataMap.get("SeoTitle").getValue() != null) {
+            String seoTitle = fieldDataMap.get("SeoTitle").getValue().toString();
+            if ("self".equals(seoTitle)) {
+                userGdTrade.setTotalType(0);
+            } else {
+                userGdTrade.setTotalType(1);
+            }
+        }
+        if (fieldDataMap.get("TradeAmount").getValue() != null) {
+            userGdTrade.setTradeAmt(new BigDecimal(fieldDataMap.get("TradeAmount").getValue().toString()));
+        }
+        if (fieldDataMap.get("HelpTradeAmount").getValue() != null) {
+            userGdTrade.setHelpTradeAmt(new BigDecimal(fieldDataMap.get("HelpTradeAmount").getValue().toString()));
+        }
+        if (fieldDataMap.get("NotHelpTradeAmount").getValue() != null) {
+            userGdTrade.setProTradeAmt(new BigDecimal(fieldDataMap.get("NotHelpTradeAmount").getValue().toString()));
+        }
+
+
+
+        KxsUserGdTrade kxsUserLogoutTrade = baseMapper.selectOne(Wrappers.<KxsUserGdTrade>lambdaQuery()
+                .eq(KxsUserGdTrade::getUserId, userGdTrade.getUserId())
+                .eq(KxsUserGdTrade::getTotalType, userGdTrade.getTotalType())
+                .eq(KxsUserGdTrade::getTradeMonth, userGdTrade.getTradeMonth())
+                .eq(KxsUserGdTrade::getTradeDate, userGdTrade.getTradeDate()));
+        if(kxsUserLogoutTrade == null){
+            baseMapper.insert(userGdTrade);
+        }else{
+            userGdTrade.setId(kxsUserLogoutTrade.getId());
+            baseMapper.updateById(userGdTrade);
+        }
+    }
+}
+