From 33fcc263ac3519cb1f7af604baa02997d7ad183b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 10 Oct 2024 17:55:05 +0800
Subject: [PATCH] 1

---
 .../scmvehrebate/ScmVehRebateExcelInfo.java   |   8 ++++++
 .../ScmSpecialRebateMapper.java               |   6 ++++
 .../ScmSpecialRebateService.java              |  12 ++++++--
 .../ScmSpecialrebateCheckapplyService.java    |  22 ++++++++++++++-
 .../biz/scmvehrebate/ScmVehRebateService.java |  26 +++++++++++++++++-
 .../resources/static/单车返利管理.xls   | Bin 17920 -> 18432 bytes
 6 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java
index 9d558f8e36..0cebfb017b 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java
@@ -18,6 +18,14 @@ public class ScmVehRebateExcelInfo {
     private String calculationStandard;
     @ApiModelProperty("返利金额")
     private String estimateRebate;
+    @ApiModelProperty("其中待支付费用")
+    private String expectTreatCost;
+    @ApiModelProperty("其中抵顶费用")
+    private String expectSuppCost;
+    @ApiModelProperty("抵顶费用说明")
+    private String expectSuppRemark;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
+    @ApiModelProperty("备注")
+    private String remarks;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
index ae5de6e018..a5ab4776e1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
@@ -77,4 +77,10 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
     List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 
     int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
+
+    @Update("update scm_special_rebate set onceCheckState = #{onceCheckState} where sid = #{sid}")
+    void updateOnceCheckState(@Param("sid") String sid, @Param("onceCheckState") int onceCheckState);
+
+    @Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
+    void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index 2d842bff5d..490b2a9a3e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -175,7 +175,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.setMsg("返利信息已存在");
         }
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
-        this.updateBySid(dto,dtoSid);
+        this.updateBySid(dto, dtoSid);
         return rb.success();
     }
 
@@ -974,7 +974,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 } else {
                     secondaryUploadDate = info.getSecondaryUploadDate();
                 }
-                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(),info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(),info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
+                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -1551,4 +1551,12 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         return twoExcelVos;
     }
+
+    public void updateOnceCheckState(String sid, int onceCheckState) {
+        baseMapper.updateOnceCheckState(sid, onceCheckState);
+    }
+
+    public void updateAdjustmentState(String sid, int adjustmentState) {
+        baseMapper.updateAdjustmentState(sid, adjustmentState);
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
index c07de248da..e78aff87ee 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
@@ -51,6 +51,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
@@ -321,6 +322,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                 scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 3);
+                ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                if (scmSpecialRebate.getOnceCheckState() != 1) {
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 2);
+                }
             }
             return voResultBean;
         }
@@ -385,7 +390,14 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
-                    scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                        scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
+                    } else {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    }
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
                 }
             }
             return rb.success().setData(resultBean.getData());
@@ -465,6 +477,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                 updateFlowFiled(map);
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                     scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if (scmSpecialRebate.getOnceCheckState() != 1) {
+                        scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                    }
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -479,6 +495,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     updateFlowFiled(map);
                     for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                         scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                        ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                        if (scmSpecialRebate.getOnceCheckState() != 1) {
+                            scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                        }
                     }
                     return rb.success().setData(resultBean.getData());
                 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 11c46cac86..2f390c8ffc 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -589,7 +589,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -688,8 +688,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                     importVo.setEstimateRebate(temp);
                                     break;
                                 case 5:
+                                    importVo.setExpectTreatCost(temp);
+                                    break;
+                                case 6:
+                                    importVo.setExpectSuppCost(temp);
+                                    break;
+                                case 7:
+                                    importVo.setExpectSuppRemark(temp);
+                                    break;
+                                case 8:
                                     importVo.setPalceGenDate(temp);
                                     break;
+                                case 9:
+                                    importVo.setRemarks(temp);
+                                    break;
                                 default:
                                     break;
                             }
@@ -717,8 +729,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                 word = "返利金额";
                                 break;
                             case 5:
+                                word = "其中待支付费用";
+                                break;
+                            case 6:
+                                word = "其中抵顶费用";
+                                break;
+                            case 7:
+                                word = "抵顶费用说明";
+                                break;
+                            case 8:
                                 word = "所属年月";
                                 break;
+                            case 9:
+                                word = "备注";
+                                break;
                             default:
                                 break;
                         }
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/static/单车返利管理.xls b/anrui-scm/anrui-scm-biz/src/main/resources/static/单车返利管理.xls
index b0bd2bd2ca54b9c7337f2e72524af175777347a6..d5875f9351617f74a4264f94e3fd2f0b3515fc05 100644
GIT binary patch
delta 361
zcmZqZVQiSdIKhTdZlmpSMn=WStW4R0vJ4Ci|Nj5~55fvSw$kQWrh3LnEIFJ7X%&s%
zq;50HPcCI?W>PfU{EOwQG2`*cA1qwi>lnCzYPlxcSn39{Gcc9~>iV_D>!;rEv+UI<
zWrGN8O)8rK<-(X>y7|&r7#OegYX)7MICln+>5vo`QxeCK&cwjT9{D2YKhRvR$t{+q
zj9Vw~vixbv$uL#Uk%5VUg`t*#2V^HB1E(X<W)=npCO#ky5&!{^YdDw$AneI6tm19|
zg2mVvoEX@Eq7WWCkjD<^aR7N7a2_X+#|h+J2dZB%*~i+1j~%R*5l8|d`{X|BqR9!a
m3&8k+Q_v=xR94m&YhVa%&T{NvX18E4VlZbg+x*jooe=;pq*=)T

delta 238
zcmZpez}V2kIKhTdcBAcaMn;9ntW4Rw|Nj5~55n>c3=E2!8=2}ECnm5=V#(o5VA44{
zmFYI4+~iW0W~R-in}4x<HD;VR`GbWky9WasP&wOV8%tej76!&E{hC1+C(fM#WI80p
z#gxQxr2l8&V&Is(%hHt5eews(pQfw~Q{@~Pm>5_XY8iMyx)~Wb9f4-BFfcIj0cnr`
z2!PDxU=o0^C(BvKvt9>^WlY{>ZNkS7QVmqc4}>f%lmA#3ZL&*cWu3A3$W*4yS<W5I
S?B)y>45kd`n}52oGXenn!#xlH