fix：“修复分销审核接口”

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

@@ -2,6 +2,8 @@ package com.szwl.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
@@ -117,48 +119,29 @@ public class TProportionCheckController {
             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(tProportionCheck.getAgencyProportion());
-                tProportion.setMerchantProportion(tProportionCheck.getMerchantProportion());
-                tProportion.setPersonageProportion(tProportionCheck.getPersonageProportion());
-                tProportion.setAgencyName(tProportionCheck.getAgencyName());
-                tProportion.setMerchantName(tProportionCheck.getMerchantName());
-                tProportion.setPersonageName(tProportionCheck.getPersonageName());
-                tProportionService.updateById(tProportion);
-                //发短信 todo
-            }else{
-                TProportion tProportion = new TProportion();
-                tProportion.setModifyDate(new Date());
-                tProportion.setCreateDate(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(tProportionCheck.getAgencyProportion());
-                tProportion.setMerchantProportion(tProportionCheck.getMerchantProportion());
-                tProportion.setPersonageProportion(tProportionCheck.getPersonageProportion());
-                tProportion.setAgencyName(tProportionCheck.getAgencyName());
-                tProportion.setMerchantName(tProportionCheck.getMerchantName());
-                tProportion.setPersonageName(tProportionCheck.getPersonageName());
-                tProportionService.save(tProportion);
+            TProportion proportion = tProportionService.getOne(query);
+            if(proportion != null){
+                tProportionService.removeById(proportion.getId());
             }
+            TProportion tProportion = new TProportion();
+            tProportion.setModifyDate(new Date());
+            tProportion.setCreateDate(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(tProportionCheck.getAgencyProportion());
+            tProportion.setMerchantProportion(tProportionCheck.getMerchantProportion());
+            tProportion.setPersonageProportion(tProportionCheck.getPersonageProportion());
+            tProportion.setAgencyName(tProportionCheck.getAgencyName());
+            tProportion.setMerchantName(tProportionCheck.getMerchantName());
+            tProportion.setPersonageName(tProportionCheck.getPersonageName());
+            tProportionService.save(tProportion);
             tProportionCheck.setCheckType("1");
             tProportionCheck.setModifyDate(new Date());
             tProportionCheckService.updateById(tProportionCheck);

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

@@ -19,12 +19,16 @@
         <result column="agency_id" property="agencyId" />
         <result column="merchant_id" property="merchantId" />
         <result column="personage_id" property="personageId" />
+        <result column="agency_name" property="agencyName" />
+        <result column="merchant_name" property="merchantName" />
+        <result column="personage_name" property="personageName" />
         <result column="type" property="type" />
+        <result column="equipment_name" property="equipmentName" />
     </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
+        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, agency_name, merchant_name, personage_name, type, equipment_name
     </sql>
 
 </mapper>

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

@@ -67,8 +67,6 @@ public class TProportion implements Serializable {
 
     private String agencyName;
 
-    private String equipmentName;
-
     private String merchantName;
 
     private String personageName;
@@ -76,5 +74,7 @@ public class TProportion implements Serializable {
     @ApiModelProperty(value = "0：分账方2个，1：分账方3个，2：分账方4个，3：分账方超4个;")
     private Integer type;
 
+    private String equipmentName;
+
 
 }

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

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