1

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

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 增值权益订单表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/service/manage/incrementOrderMg")
+public class IncrementOrderMgController {
+
+}
+

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

@@ -0,0 +1,32 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
+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 2023-07-06
+ */
+@RestController
+@RequestMapping("/service/manage/incrementUseType")
+public class IncrementUseTypeController {
+
+    @Autowired
+    IIncrementUseTypeService incrementUseTypeService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+        return ResultData.ok(incrementUseTypeService.list());
+    }
+}
+

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

@@ -0,0 +1,172 @@
+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.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 增值权益订单表
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_increment_order_mg")
+public class IncrementOrderMg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+    /**
+     * 支付宝的交易号或者微信支付订单号
+     */
+    @TableField("number")
+    private String number;
+
+    /**
+     * 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
+     */
+    @TableField("pay_type")
+    private Integer payType;
+
+    /**
+     * 状态，0或-1表示未付款，-2表示已退款,1表示已付款
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 状态，1表示新增值权益，2表示续费增值权益  3表示增值权益1月
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 交易时间
+     */
+    @TableField("trade_time")
+    private Date tradeTime;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 增值权益表t_user_increment的id,status为2时才有
+     */
+    @TableField("increment_id")
+    private Long incrementId;
+
+    /**
+     * 购买数量
+     */
+    @TableField("count")
+    private Integer count;
+
+    /**
+     * 0表示国内订单，1表示国外订单
+     */
+    @TableField("abroad")
+    private Integer abroad;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("increment_type")
+    private Integer incrementType;
+
+    /**
+     * 权益级别  PR 年会员  SE 月会员
+     */
+    @TableField("member_levels")
+    private String memberLevels;
+
+    @TableField("month_qy")
+    private Integer monthQy;
+
+    /**
+     * 时区差，单位分钟
+     */
+    @TableField("time_zone_off")
+    private Integer timeZoneOff;
+
+    /**
+     * 客户名称
+     */
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    @TableField("customer_type")
+    private Integer customerType;
+
+    /**
+     * 终端客户
+     */
+    @TableField("end_customer")
+    private String endCustomer;
+
+    /**
+     * 使用类型
+     */
+    @TableField("use_type")
+    private Integer useType;
+
+    /**
+     * 项目号
+     */
+    @TableField("project_num")
+    private String projectNum;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,57 @@
+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 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_increment_use_type")
+public class IncrementUseType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 权益使用类型
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 是否有项目号 0 无，1有
+     */
+    @TableField("type")
+    private Integer type;
+
+
+}

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_camera_type",
+                "t_increment_use_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 增值权益订单表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Mapper
+public interface IIncrementOrderMgMapper extends BaseMapper<IncrementOrderMg> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Mapper
+public interface IIncrementUseTypeMapper extends BaseMapper<IncrementUseType> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.UserIncrementParam;
+
+/**
+ * <p>
+ * 增值权益订单表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
+
+    void addOrder(UserIncrementParam param);
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+public interface IIncrementUseTypeService extends IService<IncrementUseType> {
+
+}

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

@@ -0,0 +1,43 @@
+package com.fdkankan.manage.service.impl;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.fdkankan.manage.mapper.IIncrementOrderMgMapper;
+import com.fdkankan.manage.service.IIncrementOrderMgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.vo.request.UserIncrementParam;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 增值权益订单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Service
+public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
+
+    @Override
+    public void addOrder(UserIncrementParam param) {
+        IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
+        incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
+        incrementOrderMg.setUserId(param.getUserId());
+        incrementOrderMg.setCount(param.getCount());
+        incrementOrderMg.setAbroad(0);
+        incrementOrderMg.setIncrementType(param.getIncrementTypeId());
+        incrementOrderMg.setMemberLevels("");
+        incrementOrderMg.setMonthQy(param.getMonthQy());
+        incrementOrderMg.setTimeZoneOff(0);
+        incrementOrderMg.setCustomerName(param.getCustomerName());
+        incrementOrderMg.setCustomerType(param.getCustomerType());
+        incrementOrderMg.setEndCustomer(param.getEndCustomer());
+        incrementOrderMg.setUseType(param.getUseType());
+        incrementOrderMg.setProjectNum(param.getProjectNum());
+        incrementOrderMg.setRemark(param.getRemark());
+        this.save(incrementOrderMg);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.fdkankan.manage.mapper.IIncrementUseTypeMapper;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Service
+public class IncrementUseTypeServiceImpl extends ServiceImpl<IIncrementUseTypeMapper, IncrementUseType> implements IIncrementUseTypeService {
+
+}

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

@@ -234,7 +234,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public void move(SceneParam param) {
+    public synchronized void move(SceneParam param) {
         Camera camera = cameraService.getBySnCode(param.getSnCode());
         if(camera == null){
             throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXIST);
@@ -263,7 +263,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             dataSource = scenePlusExt.getDataSource();
         }
         space = space == null ? 0 :space;
-
+        cameraDetailService.initSpace(cameraDetail.getCameraId());
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail, space);
         //深时场景无限容量
         if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && !checkSpace){

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

@@ -46,6 +46,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     ICameraIncrementLogService cameraIncrementLogService;
     @Autowired
     ISceneProService sceneProService;
+    @Autowired
+    IIncrementOrderMgService iIncrementOrderMgService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -152,6 +154,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType == null){
             throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
         }
+        iIncrementOrderMgService.addOrder(param);
+
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -16,6 +16,7 @@ public class Dateutils {
     public static int  DAY =  Calendar.DAY_OF_MONTH;
     public static int  WEEK =  Calendar.WEEK_OF_MONTH;
     public static int  MONTH =  Calendar.MONTH;
+    public static String orderSn = "yyyyMMddHHmmssSSS";
 
     /**
      * 获取指定时间区间的所有数据（包含日期和月份）
@@ -180,4 +181,15 @@ public class Dateutils {
         nowTime.add(Calendar.MINUTE, ~minute);
         return sdf.format(nowTime.getTime());
     }
+
+    public synchronized static String getOrderSn() {
+        try {
+            Thread.sleep(1L);
+        }catch (Exception e){
+
+        }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(orderSn);
+        Date date = new Date();
+        return simpleDateFormat.format(date);
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/UserIncrementParam.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -12,4 +13,34 @@ public class UserIncrementParam {
     private Integer incrementTypeId;
 
     private Integer monthQy;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    private Integer customerType;
+
+    /**
+     * 终端客户
+     */
+    private String endCustomer;
+
+    /**
+     * 使用类型
+     */
+    private Integer useType;
+
+    /**
+     * 项目号
+     */
+    private String projectNum;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

src/main/resources/mapper/manage/IncrementOrderMgMapper.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.IIncrementOrderMgMapper">
+
+</mapper>

src/main/resources/mapper/manage/IncrementUseTypeMapper.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.IIncrementUseTypeMapper">
+
+</mapper>