分销设置

src/main/java/com/szwl/controller/IndexController.java

@@ -122,9 +122,11 @@ public class IndexController { ;
      * @return
      */
     @ApiOperation(value = "设备申请")
-    @PostMapping("/init3")
-    public JsonMessage initNew(String clientId, String managerId, String gtClientId,String equimentType,String machineType) {
-
+//    @PostMapping("/init3")
+    @PostMapping("/initNew.htm")
+//    public JsonMessage initNew(String clientId, String managerId, String gtClientId,String equimentType,String machineType) {
+    public JsonMessage initNew(String clientId, String managerId, String gtClientId,String equimentType) {
+        String machineType = "0";
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = equipmentService.list(query);
@@ -159,8 +161,10 @@ public class IndexController { ;
         equipmentApply.setAdminUserName(username);
         equipmentApply.setEquimentType(equimentType);
         equipmentApply.setMachineType(machineType);
+        equipmentApply.setCreateDate(new Date());
+        equipmentApply.setModifyDate(new Date());
         equipmentApplyService.save(equipmentApply);
-        if(String.valueOf(adminId).equals("31")||String.valueOf(adminId).equals("506")||String.valueOf(adminId).equals("1090")){
+        if(String.valueOf(adminId).equals("3")||String.valueOf(adminId).equals("31")||String.valueOf(adminId).equals("506")||String.valueOf(adminId).equals("1090")){
             Long id = equipmentApply.getId();
             agree(id);
             return JsonMessage.success("设备申请成功");

src/main/java/com/szwl/controller/RabbitMqController.java

@@ -40,7 +40,7 @@ public class RabbitMqController {
      * @param
      * @return
      */
-    @GetMapping(value = "/addExchange")
+    @GetMapping(value = "/addExchange.htm")
     @ResponseBody
     public Object addExchange(String exchange,String type,Boolean durable){
         if(StringUtils.isEmpty(type)){
@@ -64,7 +64,7 @@ public class RabbitMqController {
      * @param
      * @return
      */
-    @GetMapping(value = "/addQueue")
+    @GetMapping(value = "/addQueue.htm")
     @ResponseBody
     public Object addQueue(String exchange,String queue,String routingKey,Boolean durable){
         Map<String,Object> arg = new HashMap<>();
@@ -87,7 +87,7 @@ public class RabbitMqController {
      * @param
      * @return
      */
-    @GetMapping(value = "/updateChannel")
+    @GetMapping(value = "/updateChannel.htm")
     @ResponseBody
     public Object updateChannel(String clientId,String type){
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();

src/main/java/com/szwl/controller/TProportionCheckController.java

@@ -0,0 +1,150 @@
+package com.szwl.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TProportion;
+import com.szwl.model.entity.TProportionCheck;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TProportionCheckService;
+import com.szwl.service.TProportionService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 分账变动申请表 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@RestController
+@RequestMapping("/tProportionCheck")
+public class TProportionCheckController {
+    @Autowired
+    TProportionCheckService tProportionCheckService;
+    @Autowired
+    TProportionService tProportionService;
+    @Autowired
+    TEquipmentService tEquipmentService;
+    @Autowired
+    TAdminService adminService;
+    @ApiOperation(value = "分销审核信息详情")
+    @PostMapping("/getOne")
+    public ResponseModel<?> findById(Long id) {
+        TAdmin admin = adminService.getById(id);
+        LambdaQueryWrapper<TProportionCheck> query = Wrappers.lambdaQuery();
+        query.eq(TProportionCheck::getId,id);
+        List<TProportionCheck> list = tProportionCheckService.list(query);
+        if(list.size()>0){
+            TProportionCheck tProportionCheck = list.get(0);
+            if(tProportionCheck.getAgencyId()!=null){
+                TAdmin admin1 = adminService.getById(tProportionCheck.getAgencyId());
+                tProportionCheck.setAgencyName(admin1.getUsername());
+            }
+            if(tProportionCheck.getMerchantId()!=null){
+                TAdmin admin2 = adminService.getById(tProportionCheck.getMerchantId());
+                tProportionCheck.setAgencyName(admin2.getUsername());
+            }
+            if(tProportionCheck.getPersonageId()!=null){
+                TAdmin admin3 = adminService.getById(tProportionCheck.getId());
+                tProportionCheck.setAgencyName(admin3.getUsername());
+            }
+            return R.ok(tProportionCheck);
+        }else {
+            return R.fail("");
+        }
+    }
+    @ApiOperation(value = "撤销申请")
+    @PostMapping("/update")
+    public ResponseModel<?> update(Long id) {
+        LambdaQueryWrapper<TProportionCheck> query = Wrappers.lambdaQuery();
+        query.eq(TProportionCheck::getId,id);
+        List<TProportionCheck> list = tProportionCheckService.list(query);
+        if(list.size()>0){
+            TProportionCheck tProportionCheck = list.get(0);
+            tProportionCheck.setCheckType("2");
+            tProportionCheck.setModifyDate(new Date());
+            tProportionCheckService.updateById(tProportionCheck);
+            return R.ok();
+        }else {
+            return R.fail("撤销失败");
+        }
+    }
+
+    @PostMapping("/getList")
+    public ResponseModel<?> getList(String username, String type) {
+        LambdaQueryWrapper<TProportionCheck> query = Wrappers.lambdaQuery();
+        if(StringUtils.isNotEmpty(username)){
+            LambdaQueryWrapper<TAdmin> query1 = Wrappers.lambdaQuery();
+            query1.eq(TAdmin::getUsername,username);
+            List<TAdmin> list1 = adminService.list(query1);
+            if(list1.size()>0){
+                query.eq(TProportionCheck::getAdminId,list1.get(0).getId());
+            }
+        }
+        if(StringUtils.isNotEmpty(type)){
+            query.eq(TProportionCheck::getCheckType,type);
+        }
+        List<TProportionCheck> list = tProportionCheckService.list(query);
+        if(list.size()>0){
+            return R.ok(list);
+        }else {
+            return R.fail("没有审核信息");
+        }
+    }
+
+    @ApiOperation(value = "平台审核是否通过")
+    @PostMapping("/shenhe")
+    public ResponseModel<?> shenhe(Long id,String type) {
+        if(type.equals("0")){
+            //通过
+            TProportionCheck tProportionCheck = tProportionCheckService.getById(id);
+            LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
+            query.eq(TProportion::getAdminId,tProportionCheck.getAdminId());
+            query.eq(TProportion::getEquipmentId,tProportionCheck.getEquipmentId());
+            List<TProportion> list = tProportionService.list(query);
+            if(list.size()>0){
+                TProportion tProportion = list.get(0);
+                tProportion.setModifyDate(new Date());
+//                tProportion.setAdminId(tProportionCheck.getAdminId());
+//                tProportion.setEquipmentId(tProportionCheck.getEquipmentId());
+//                tProportion.setClientId(tProportionCheck.getClientId());
+                tProportion.setType(tProportionCheck.getType());
+                tProportion.setProportion(tProportionCheck.getProportion());
+                tProportion.setAdminProportion(tProportionCheck.getAdminProportion());
+                tProportion.setAgencyId(tProportionCheck.getAgencyId());
+                tProportion.setMerchantId(tProportionCheck.getMerchantId());
+                tProportion.setPersonageId(tProportionCheck.getPersonageId());
+                tProportion.setAgencyProportion(tProportion.getAgencyProportion());
+                tProportion.setMerchantProportion(tProportion.getMerchantProportion());
+                tProportion.setPersonageProportion(tProportion.getPersonageProportion());
+                tProportionService.updateById(tProportion);
+                tProportionCheck.setCheckType("1");
+                tProportionCheck.setModifyDate(new Date());
+                tProportionCheckService.updateById(tProportionCheck);
+            }
+        }else {
+            //拒绝
+            TProportionCheck tShandeMchCheck = tProportionCheckService.getById(id);
+            tShandeMchCheck.setModifyDate(new Date());
+            tShandeMchCheck.setCheckType("3");
+            tProportionCheckService.updateById(tShandeMchCheck);
+        }
+        return R.ok();
+    }
+}
+

src/main/java/com/szwl/controller/TProportionController.java

@@ -0,0 +1,257 @@
+package com.szwl.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.*;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TProportionCheckService;
+import com.szwl.service.TProportionService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 分账表 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@RestController
+@RequestMapping("/tProportion")
+public class TProportionController {
+    @Autowired
+    TProportionCheckService tProportionCheckService;
+    @Autowired
+    TProportionService tProportionService;
+    @Autowired
+    TEquipmentService tEquipmentService;
+    @Autowired
+    TAdminService adminService;
+    @ApiOperation(value = "查找机器分销信息信息")
+    @PostMapping("/getOne")
+    public ResponseModel<?> findById(Long adminid, String clientId) {
+        TAdmin admin = adminService.getById(adminid);
+//        if(!admin.getUsername().equals(username)){
+//            return R.fail("username不符合！");
+//        }
+        LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
+        query.eq(TProportion::getAdminId,adminid);
+        query.eq(TProportion::getClientId,clientId);
+        List<TProportion> list = tProportionService.list(query);
+        if(list.size()>0){
+            //已经注册，就要查看是否有提交审核的
+//            LambdaQueryWrapper<TProportionCheck> query1 = Wrappers.lambdaQuery();
+//            query1.eq(TProportionCheck::getAdminId,adminid);
+//            query1.eq(TProportionCheck::getClientId,clientId);
+//            List<TProportionCheck> list1 = tProportionCheckService.list(query1);
+//            if(list1.size()>0){
+//                int i = 0;
+//                for(TProportionCheck tProportionCheck:list1){
+//                    if(tProportionCheck.getCheckType().equals("0")||tProportionCheck.getCheckType().equals("3")){
+//                        i++;
+//                    }
+//                }
+//                if(i==0){
+//                    return R.ok(list.get(0));
+//                }else {
+//                    for(int j=list1.size()-1;j>=0;j--){
+//                        if(!list1.get(j).getCheckType().equals("2")&!list1.get(j).getCheckType().equals("1")){
+//                            if(list1.get(j).getCheckType().equals("3")){
+//                                Date data = new Date();
+//                                long time = data.getTime();
+//                                long updateTime = list1.get(j).getModifyDate().getTime();
+//                                if(3*24*60*60*1000l>time-updateTime){
+//                                    //拒绝的审核，超过3天后不显示
+//                                    return R.ok(list.get(0));
+//                                }else {
+//                                    return R.ok(list.get(j));
+//                                }
+//                            }
+//                            return R.ok(list.get(j));
+//                        }
+//                    }
+//                }
+//            }else {
+//                return R.ok(list.get(0));
+//            }
+            TProportion tProportion = list.get(0);
+            if(tProportion.getAgencyId()!=null){
+                TAdmin admin1 = adminService.getById(tProportion.getAgencyId());
+                tProportion.setAgencyName(admin1.getUsername());
+            }
+            if(tProportion.getMerchantId()!=null){
+                TAdmin admin2 = adminService.getById(tProportion.getMerchantId());
+                tProportion.setAgencyName(admin2.getUsername());
+            }
+            if(tProportion.getPersonageId()!=null){
+                TAdmin admin3 = adminService.getById(tProportion.getId());
+                tProportion.setAgencyName(admin3.getUsername());
+            }
+            return R.ok(tProportion);
+        }else {
+            return R.fail("尚未注册！");
+        }
+    }
+
+    @ApiOperation(value = "保存或提交审核")
+    @PostMapping("/save")
+    public ResponseModel<?> save(@RequestBody TProportion tProportion) {
+        if(tProportion.getAdminId()==null||StringUtils.isEmpty(tProportion.getClientId())){
+            R.fail("信息有空！");
+        }
+        TAdmin admin = adminService.getById(tProportion.getAdminId());
+        //查找机器，看改商家是否有该机器
+        LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
+        query1.eq(TEquipment::getAdminId,tProportion.getAdminId());
+        query1.eq(TEquipment::getClientId,tProportion.getClientId());
+        List<TEquipment> equipmentList = tEquipmentService.list(query1);
+        if(equipmentList.size()<=0){
+            R.fail("找不到该机器！");
+        }
+        TEquipment equipment = equipmentList.get(0);
+        //查看是否有审核中的
+        LambdaQueryWrapper<TProportionCheck> queryCheck = Wrappers.lambdaQuery();
+        queryCheck.eq(TProportionCheck::getAdminId,tProportion.getAdminId());
+        queryCheck.eq(TProportionCheck::getClientId,tProportion.getClientId());
+        queryCheck.eq(TProportionCheck::getCheckType,"0");
+        List<TProportionCheck> listCheck = tProportionCheckService.list(queryCheck);
+        if(listCheck.size()>0){
+            R.fail("已有审核，如需修改请先取消原来的审核！");
+        }
+        Long agencyId = null;
+        Long merchantId = null;
+        Long personageId = null;
+        //查找个分账人的id
+        if(tProportion.getType()>0){
+            //1个
+            LambdaQueryWrapper<TAdmin> queryTAdmin = Wrappers.lambdaQuery();
+            queryTAdmin.eq(TAdmin::getUsername,tProportion.getAgencyName());
+            List<TAdmin> admins = adminService.list(queryTAdmin);
+            if(admins.size()>0){
+                TAdmin tAdmin = admins.get(0);
+                agencyId = tAdmin.getAreaId();
+            }else {
+                R.fail("找不到第一个分账人！");
+            }
+        }
+        if(tProportion.getType()>1){
+            //2个
+            LambdaQueryWrapper<TAdmin> queryTAdmin1 = Wrappers.lambdaQuery();
+            queryTAdmin1.eq(TAdmin::getUsername,tProportion.getMerchantName());
+            List<TAdmin> admins1 = adminService.list(queryTAdmin1);
+            if(admins1.size()>0){
+                TAdmin tAdmin = admins1.get(0);
+                merchantId = tAdmin.getAreaId();
+            }else {
+                R.fail("找不到第二个分账人！");
+            }
+        }
+        if(tProportion.getType()>3){
+            //3个
+            LambdaQueryWrapper<TAdmin> queryTAdmin2 = Wrappers.lambdaQuery();
+            queryTAdmin2.eq(TAdmin::getUsername,tProportion.getPersonageId());
+            List<TAdmin> admins2 = adminService.list(queryTAdmin2);
+            if(admins2.size()>0){
+                TAdmin tAdmin = admins2.get(0);
+                personageId = tAdmin.getAreaId();
+            }else {
+                R.fail("找不到第三个分账人！");
+            }
+
+        }
+        LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
+        query.eq(TProportion::getAdminId,tProportion.getAdminId());
+        query.eq(TProportion::getClientId,tProportion.getClientId());
+        List<TProportion> list = tProportionService.list(query);
+        if(list.size()>0){
+            //已有，属于第二次提交信息，需要审核
+            TProportion oldProportion = list.get(0);
+            //已有，判断是否为99%和1%组合
+//            if(tProportion.getProportion().compareTo(new BigDecimal("99"))==0&&tProportion.getAdminProportion().compareTo(new BigDecimal("1"))==0){
+//                oldProportion.setAgencyId(agencyId);
+//                oldProportion.setMerchantId(merchantId);
+//                oldProportion.setPersonageId(personageId);
+//                oldProportion.setAgencyProportion(BigDecimal.valueOf(0.00));
+//                oldProportion.setMerchantProportion(BigDecimal.valueOf(0.00));
+//                oldProportion.setPersonageProportion(BigDecimal.valueOf(0.00));
+//                oldProportion.setModifyDate(new Date());
+//                tProportionService.updateById(tProportion);
+//                return R.ok("修改成功");
+//            }else {
+                //提交审核
+                TProportionCheck proportionCheck = new TProportionCheck();
+                proportionCheck.setAdminId(tProportion.getAdminId());
+                proportionCheck.setEquipmentId(equipment.getId());
+                proportionCheck.setClientId(tProportion.getClientId());
+                proportionCheck.setType(tProportion.getType());
+                proportionCheck.setProportion(tProportion.getProportion());
+                proportionCheck.setAdminProportion(tProportion.getAdminProportion());
+                proportionCheck.setAgencyId(agencyId);
+                proportionCheck.setMerchantId(merchantId);
+                proportionCheck.setPersonageId(personageId);
+                proportionCheck.setAgencyProportion(tProportion.getAgencyProportion());
+                proportionCheck.setMerchantProportion(tProportion.getMerchantProportion());
+                proportionCheck.setPersonageProportion(tProportion.getPersonageProportion());
+                proportionCheck.setCreateDate(new Date());
+                proportionCheck.setModifyDate(new Date());
+                proportionCheck.setCheckType("0");
+                tProportionCheckService.save(proportionCheck);
+                return R.ok("已提交审核");
+//            }
+        }else {
+            //没有，判断是否为99%和1%组合
+            if(tProportion.getProportion().compareTo(new BigDecimal("99"))==0&&tProportion.getAdminProportion().compareTo(new BigDecimal("1"))==0){
+                tProportion.setAgencyId(agencyId);
+                tProportion.setMerchantId(merchantId);
+                tProportion.setPersonageId(personageId);
+                tProportion.setAgencyProportion(BigDecimal.valueOf(0.00));
+                tProportion.setMerchantProportion(BigDecimal.valueOf(0.00));
+                tProportion.setPersonageProportion(BigDecimal.valueOf(0.00));
+                tProportion.setCreateDate(new Date());
+                tProportion.setModifyDate(new Date());
+                tProportionService.save(tProportion);
+                return R.ok("添加成功");
+            }else {
+                //提交审核
+                TProportionCheck proportionCheck = new TProportionCheck();
+                proportionCheck.setAdminId(tProportion.getAdminId());
+                proportionCheck.setEquipmentId(equipment.getId());
+                proportionCheck.setClientId(tProportion.getClientId());
+                proportionCheck.setType(tProportion.getType());
+                proportionCheck.setProportion(tProportion.getProportion());
+                proportionCheck.setAdminProportion(tProportion.getAdminProportion());
+                proportionCheck.setAgencyId(agencyId);
+                proportionCheck.setMerchantId(merchantId);
+                proportionCheck.setPersonageId(personageId);
+                proportionCheck.setAgencyProportion(tProportion.getAgencyProportion());
+                proportionCheck.setMerchantProportion(tProportion.getMerchantProportion());
+                proportionCheck.setPersonageProportion(tProportion.getPersonageProportion());
+                proportionCheck.setCreateDate(new Date());
+                proportionCheck.setModifyDate(new Date());
+                proportionCheck.setCheckType("0");
+                tProportionCheckService.save(proportionCheck);
+                return R.ok("已提交审核");
+            }
+//            tProportion.setSettleableBalance(BigDecimal.valueOf(0.00));
+//            tProportion.setCreateDate(new Date());
+//            tProportion.setModifyDate(new Date());
+//            tProportionService.save(tProportion);
+        }
+    }
+}
+

src/main/java/com/szwl/controller/TShandeMchController.java

@@ -139,7 +139,7 @@ public class TShandeMchController {
             tShandeMch.setCreateDate(new Date());
             tShandeMch.setModifyDate(new Date());
             tShandeMchService.save(tShandeMch);
-            return R.fail("尚未注册！");
+            return R.ok();
         }
     }
 }

src/main/java/com/szwl/mapper/TProportionCheckMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TProportionCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分账变动申请表 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+public interface TProportionCheckMapper extends BaseMapper<TProportionCheck> {
+
+}

src/main/java/com/szwl/mapper/TProportionMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TProportion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分账表 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+public interface TProportionMapper extends BaseMapper<TProportion> {
+
+}

src/main/java/com/szwl/mapper/xml/TProportionCheckMapper.xml

@@ -0,0 +1,31 @@
+<?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.szwl.mapper.TProportionCheckMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TProportionCheck">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="client_id" property="clientId" />
+        <result column="admin_proportion" property="adminProportion" />
+        <result column="agency_proportion" property="agencyProportion" />
+        <result column="merchant_proportion" property="merchantProportion" />
+        <result column="personage_proportion" property="personageProportion" />
+        <result column="proportion" property="proportion" />
+        <result column="proportion_desc" property="proportionDesc" />
+        <result column="agency_id" property="agencyId" />
+        <result column="merchant_id" property="merchantId" />
+        <result column="personage_id" property="personageId" />
+        <result column="type" property="type" />
+        <result column="check_type" property="checkType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, equipment_id, client_id, admin_proportion, agency_proportion, merchant_proportion, personage_proportion, proportion, proportion_desc, agency_id, merchant_id, personage_id, type, check_type
+    </sql>
+
+</mapper>

src/main/java/com/szwl/mapper/xml/TProportionMapper.xml

@@ -0,0 +1,30 @@
+<?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.szwl.mapper.TProportionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TProportion">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="client_id" property="clientId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="admin_proportion" property="adminProportion" />
+        <result column="agency_proportion" property="agencyProportion" />
+        <result column="merchant_proportion" property="merchantProportion" />
+        <result column="personage_proportion" property="personageProportion" />
+        <result column="proportion" property="proportion" />
+        <result column="proportion_desc" property="proportionDesc" />
+        <result column="agency_id" property="agencyId" />
+        <result column="merchant_id" property="merchantId" />
+        <result column="personage_id" property="personageId" />
+        <result column="type" property="type" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, client_id, equipment_id, admin_proportion, agency_proportion, merchant_proportion, personage_proportion, proportion, proportion_desc, agency_id, merchant_id, personage_id, type
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/entity/TProportion.java

@@ -0,0 +1,78 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 分账表
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TProportion对象", description="分账表")
+public class TProportion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private Long adminId;
+
+    private String clientId;
+
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "平台分销;")
+    private BigDecimal adminProportion;
+
+    @ApiModelProperty(value = "一级分销;")
+    private BigDecimal agencyProportion;
+
+    @ApiModelProperty(value = "二级分销;")
+    private BigDecimal merchantProportion;
+
+    @ApiModelProperty(value = "三级分销;")
+    private BigDecimal personageProportion;
+
+    @ApiModelProperty(value = "商家自己的分销")
+    private BigDecimal proportion;
+
+    @ApiModelProperty(value = "当分账方超过4个时启用，分销详情（adminId1：分销1，adminId2：分销2.。。。）")
+    private String proportionDesc;
+
+    @ApiModelProperty(value = "一级分销商家id")
+    private Long agencyId;
+
+    @ApiModelProperty(value = "二级分销商家id")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "三级分销商家id")
+    private Long personageId;
+
+    private String agencyName;
+
+    private String merchantName;
+
+    private String personageName;
+
+    @ApiModelProperty(value = "0：分账方2个，1：分账方3个，2：分账方4个，3：分账方超4个;")
+    private Integer type;
+
+
+}

src/main/java/com/szwl/model/entity/TProportionCheck.java

@@ -0,0 +1,76 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 分账变动申请表
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TProportionCheck对象", description="分账变动申请表")
+public class TProportionCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private Long adminId;
+
+    private Long equipmentId;
+
+    private String clientId;
+
+    private BigDecimal adminProportion;
+
+    private BigDecimal agencyProportion;
+
+    private BigDecimal merchantProportion;
+
+    private BigDecimal personageProportion;
+
+    @ApiModelProperty(value = "商家自己的分销")
+    private BigDecimal proportion;
+
+    @ApiModelProperty(value = "当分账方超过4个时启用，分销详情（adminId1：分销1，adminId2：分销2.。。。）")
+    private String proportionDesc;
+
+    @ApiModelProperty(value = "一级分销商家id")
+    private Long agencyId;
+
+    @ApiModelProperty(value = "二级分销商家id")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "三级分销商家id")
+    private Long personageId;
+
+    private String agencyName;
+
+    private String merchantName;
+
+    private String personageName;
+
+    private Integer type;
+
+    @ApiModelProperty(value = "审核状态  0：未审核  1：通过  2：取消  3：不通过")
+    private String checkType;
+
+
+}

src/main/java/com/szwl/model/utils/AdminUtils.java

@@ -51,7 +51,7 @@ public final class AdminUtils {
 
 
     public static void main(String[] args) {
-        System.out.println(encrypt(false, 36L));
+        System.out.println(encrypt(false, 3L));
         System.out.println(decrypt(false, "2478"));
     }
 }

src/main/java/com/szwl/service/TProportionCheckService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TProportionCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分账变动申请表 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+public interface TProportionCheckService extends IService<TProportionCheck> {
+
+}

src/main/java/com/szwl/service/TProportionService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TProportion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分账表 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+public interface TProportionService extends IService<TProportion> {
+
+}

src/main/java/com/szwl/service/impl/TProportionCheckServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TProportionCheck;
+import com.szwl.mapper.TProportionCheckMapper;
+import com.szwl.service.TProportionCheckService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分账变动申请表 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@Service
+public class TProportionCheckServiceImpl extends ServiceImpl<TProportionCheckMapper, TProportionCheck> implements TProportionCheckService {
+
+}

src/main/java/com/szwl/service/impl/TProportionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TProportion;
+import com.szwl.mapper.TProportionMapper;
+import com.szwl.service.TProportionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分账表 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-05-10
+ */
+@Service
+public class TProportionServiceImpl extends ServiceImpl<TProportionMapper, TProportion> implements TProportionService {
+
+}