批量导入账号过期时间

src/main/java/com/fdkankan/manage/controller/CurrencyController.java

@@ -0,0 +1,32 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.ICurrencyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-09-05
+ */
+@RestController
+@RequestMapping("/service/manage/currency")
+public class CurrencyController {
+
+    @Autowired
+    ICurrencyService currencyService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+        return ResultData.ok(currencyService.list());
+    }
+}
+

src/main/java/com/fdkankan/manage/controller/ExcelController.java

@@ -29,7 +29,7 @@ public class ExcelController {
 
     /**
      * 下载出入库模板
-     * type 0 入库模板， 1出库模板 ，2 客户关联模板,3 rtk设备模版，4rtk账号模版
+     * type 0 入库模板， 1出库模板 ，2 客户关联模板,3 rtk设备模版，4rtk账号模版,5 rtk账号过期时间
      */
     @GetMapping("/downTemplate")
     public void downInTemplate(@RequestParam(required = false,defaultValue = "0") Integer type,
@@ -66,7 +66,7 @@ public class ExcelController {
     }
     /**
      * 导入excel
-     * type 0 入库模板， 1出库模板 ，2 客户关联模板,3 rtk设备模版，4rtk账号模版
+     * type 0 入库模板， 1出库模板 ，2 客户关联模板,3 rtk设备模版，4rtk账号模版,5 rtk账号过期时间
      */
     @PostMapping("/uploadExcel")
     public ResultData uploadExcel(@RequestParam(required = false) MultipartFile file,

src/main/java/com/fdkankan/manage/entity/Currency.java

@@ -0,0 +1,51 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-09-05
+ */
+@Getter
+@Setter
+@TableName("t_currency")
+public class Currency implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("symbol")
+    private String symbol;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("name_en")
+    private String nameEn;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/entity/IncrementOrderMg.java

@@ -173,4 +173,7 @@ public class IncrementOrderMg implements Serializable {
     @TableField("agent_name")
     private String agentName;
 
+    @TableField("currency_symbol")
+    private String currencySymbol;
+
 }

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_rtk_account","t_rtk_device","t_rtk_use_log"
+                "t_currency"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/ICurrencyMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.Currency;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-09-05
+ */
+@Mapper
+public interface ICurrencyMapper extends BaseMapper<Currency> {
+
+}

src/main/java/com/fdkankan/manage/service/ICurrencyService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.Currency;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-09-05
+ */
+public interface ICurrencyService extends IService<Currency> {
+
+}

src/main/java/com/fdkankan/manage/service/impl/CurrencyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.Currency;
+import com.fdkankan.manage.mapper.ICurrencyMapper;
+import com.fdkankan.manage.service.ICurrencyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-09-05
+ */
+@Service
+public class CurrencyServiceImpl extends ServiceImpl<ICurrencyMapper, Currency> implements ICurrencyService {
+
+}

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -58,6 +58,8 @@ public class IncrementOrderVo {
     @ExcelProperty("权益类型")
     private String memberLevels;
 
+    @ExcelProperty("币种")
+    private BigDecimal currencySymbol;              //订单金额
     @ExcelProperty("订单金额")
     private BigDecimal amount;              //订单金额
 

src/main/resources/mapper/manage/CurrencyMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.manage.mapper.ICurrencyMapper">
+
+</mapper>

src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -5,7 +5,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
         select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
                null as customer_name,0 as customer_type,null as end_customer,null as use_type ,null as project_num ,
-               null as remark,null as agentName,null as agentId,
+               null as remark,null as agentName,null as agentId,o.currency_symbol
                 u.user_name,u.nick_name,
                '线上' as payMethod
         from  t_increment_order o
@@ -16,7 +16,7 @@
         </if>
         union all
         select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
-        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id,
+        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id,o.currency_symbol
         u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>