Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -977,7 +977,9 @@
     </select>
 
     <select id="getPcVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
-        select vinNo as vin,sid as carSid
+        select vinNo as vin,sid as carSid,
+        settlementStatus,
+        settlementStatusValue
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java

@@ -37,4 +37,6 @@ public class AppOrderModelInfoVo implements Vo {
 
     @ApiModelProperty("配置")
     private String config;
+
+    private String specialInstructions;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,4 +30,6 @@ public class AppOrderTopInfoVo implements Vo {
 
     @ApiModelProperty(value = "上装名称")
     private String topName;
+    @JsonIgnore
+    private String remarks;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -58,6 +58,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
@@ -76,6 +77,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDeta
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
@@ -207,6 +209,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private SysProUrlFeign sysProUrlFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private BusDepositService busDepositService;
 
     /**
      * 构造查询条件
@@ -983,6 +987,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                //再加回来
+                BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
+                if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                    //根据订金sid查询虚拟订单和订金的关联
+                    List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+                    listVos.removeAll(Collections.singleton(null));
+                    if (!listVos.isEmpty()) {
+                        for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                            //查询该虚拟订金单已使用的订金值
+                            String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
+                            depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
+                            //更新该虚拟订单的订金值
+                            busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
+                        }
+                    }
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1746,6 +1766,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
         if (busSalesOrderDeposit != null) {
+            if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                //根据订金sid查询虚拟订单和订金的关联
+                List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+                listVos.removeAll(Collections.singleton(null));
+                if (!listVos.isEmpty()) {
+                    for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                        //查询该虚拟订金单已使用的订金值
+                        String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
+                        depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
+                        //更新该虚拟订单的订金值
+                        busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
+                    }
+                }
+            }
             //删除订金信息
             busSalesOrderDepositService.deleteByOrderSid(sid);
             if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
@@ -2202,12 +2236,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
         if (busSalesOrderInsurance != null) {
             if ("0".equals(busSalesOrder.getIsInsurance())) {
-                vo.setInsuranceInfo("未在公司入保，" + busSalesOrderInsurance.getRemarks());
+                vo.setInsuranceInfo("未在公司入保" + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks());
             } else if ("1".equals(busSalesOrder.getIsInsurance())) {
-                String x = ",";
+                String x = "、";
-                String x1 = "单台车保费预估金额";
+                String x1 = "单台车保费预估金额（元）：";
-                String x2 = "入保期数";
+                String x2 = "公司入保期数：";
-                vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
+                String info = "公司投保、保险公司名称：" + busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum();
+                if (StringUtils.isNotBlank(busSalesOrderInsurance.getRemarks())) {
+                    info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
+                }
+                vo.setInsuranceInfo(info);
             }
         } else {
             if ("0".equals(busSalesOrder.getIsInsurance())) {
@@ -2258,6 +2296,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         topInfo.setContractImages(stringList1);
                     }
                 }
+                if (StringUtils.isNotBlank(topInfo.getRemarks())) {
+                    topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks());
+                }
                 vo.setTopInfo(topInfo);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -244,6 +244,20 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             if ("01".equals(dto.getDepositTypeKey())) {
                 //将需补交订金设置为null
                 baseMapper.updateMakeUpDeposit(depositSid);
+
+            }
+            //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中
+            //根据订金sid查询虚拟订单和订金的关联
+            List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+            listVos.removeAll(Collections.singleton(null));
+            if (!listVos.isEmpty()) {
+                for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                    //查询该虚拟订金单已使用的订金值
+                    String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
+                    depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
+                    //更新该虚拟订单的订金值
+                    busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
+                }
             }
         }
         List<AppBusSalesOrderDepositListVo> list = busDepositFictitiousService.getList(depositSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -80,11 +80,10 @@
                        IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice, '元'),
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig),
-                          NULL),
-                       IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注：', remarks),
                           NULL)) as topBean,
                contractPath,
-               topName
+               topName,
+               remarks
         FROM bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -63,7 +63,8 @@
                    when 1 then '0'
                    when 2 then '1'
                    when 3 then '2' end as type,
-               bp.quantity             as total
+               bp.quantity             as total,
+        bm.specialConfig as specialInstructions
         from bus_sales_order_model bm
                  left join bus_sales_order bo on bm.salesOrderSid = bo.sid
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -205,7 +205,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             //入账类型
             fpaybillentry.setFRuZhangType("1");
             //我方银行账号
-            fpaybillentry.setFACCOUNTID(finPaymentrecord.getReceiveBankAccount());
+            fpaybillentry.setFACCOUNTID("100473861600010002");//finPaymentrecord.getReceiveBankAccount());
             //支付类型
             fpaybillentry.setFPayType("A");
             //付款用途

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -34,6 +34,8 @@ public enum ProcDefEnum {
     BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),
     SCMVEHREBATECHECKAPPLY("单车返利核对申请","process_3xtbbru8:1:560004"),
+    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请",""),
+    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请",""),
     CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
     ;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.scm.api.scmspecialrebate;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-scm(专项返利管理) <br/>
  * File: ScmSpecialRebateVo.java <br/>
@@ -51,6 +54,11 @@ public class ScmSpecialRebateDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("品牌名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.scm.api.scmspecialrebate;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-scm(专项返利管理) <br/>
  * File: ScmSpecialRebateVo.java <br/>
@@ -51,6 +54,11 @@ public class ScmSpecialRebateVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+    @ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
+    private String state; // 状态
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("品牌名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply <br/>
+ * Description: 专项返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表", description = "专项返利核对申请表")
+@TableName("scm_specialrebate_checkapply")
+public class ScmSpecialrebateCheckapply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo <br/>
+ * Description: 专项返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表 视图数据详情", description = "专项返利核对申请表 视图数据详情")
+public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto <br/>
+ * Description: 专项返利核对申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表 数据传输对象", description = "专项返利核对申请表 数据传输对象")
+public class ScmSpecialrebateCheckapplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign <br/>
+ * Description: 专项返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利核对申请表")
+@FeignClient(
+        contextId = "anrui-scm-ScmSpecialrebateCheckapply",
+        name = "anrui-scm",
+        path = "v1/scmspecialrebatecheckapply",
+        fallback = ScmSpecialrebateCheckapplyFeignFallback.class)
+public interface ScmSpecialrebateCheckapplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeignFallback <br/>
+ * Description: 专项返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebateCheckapplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(PagerQuery<ScmSpecialrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmSpecialrebateCheckapplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapply/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyQuery <br/>
+ * Description: 专项返利核对申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表 查询条件", description = "专项返利核对申请表 查询条件")
+public class ScmSpecialrebateCheckapplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo <br/>
+ * Description: 专项返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表 视图数据对象", description = "专项返利核对申请表 视图数据对象")
+public class ScmSpecialrebateCheckapplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetail.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail <br/>
+ * Description: 专项返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表", description = "专项返利核对申请表_返利列表")
+@TableName("scm_specialrebate_checkapplydetail")
+public class ScmSpecialrebateCheckapplydetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表 视图数据详情", description = "专项返利核对申请表_返利列表 视图数据详情")
+public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto <br/>
+ * Description: 专项返利核对申请表_返利列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表 数据传输对象", description = "专项返利核对申请表_返利列表 数据传输对象")
+public class ScmSpecialrebateCheckapplydetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign <br/>
+ * Description: 专项返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利核对申请表_返利列表")
+@FeignClient(
+        contextId = "anrui-scm-ScmSpecialrebateCheckapplydetail",
+        name = "anrui-scm",
+        path = "v1/scmspecialrebatecheckapplydetail",
+        fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class)
+public interface ScmSpecialrebateCheckapplydetailFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeignFallback <br/>
+ * Description: 专项返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecialrebateCheckapplydetailFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmSpecialrebateCheckapplydetailDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery <br/>
+ * Description: 专项返利核对申请表_返利列表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表 查询条件", description = "专项返利核对申请表_返利列表 查询条件")
+public class ScmSpecialrebateCheckapplydetailQuery implements Query {
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表 视图数据对象", description = "专项返利核对申请表_返利列表 视图数据对象")
+public class ScmSpecialrebateCheckapplydetailVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWith.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWith.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith <br/>
+ * Description: 专项返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表", description = "专项返利预提表")
+@TableName("scm_special_rebate_with")
+public class ScmSpecialRebateWith extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("专项返利预提申请sid")
+    private String mainSid; // 专项返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo <br/>
+ * Description: 专项返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情")
+public class ScmSpecialRebateWithDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("预提返利")
+    private String withRebate; // 预提返利
+    @ApiModelProperty("台数")
+    private String num; // 台数
+    @ApiModelProperty("专项返利sid")
+    private List<String> specialRebateSids; // 专项返利sid
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+    @ApiModelProperty("返利类型key")
+    private String rebateTypeKey; // 返利类型key
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue; // 返利类型value
+	@ApiModelProperty("专项返利预提申请sid")
+    private String mainSid; // 专项返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto <br/>
+ * Description: 专项返利预提表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表 数据传输对象", description = "专项返利预提表 数据传输对象")
+public class ScmSpecialRebateWithDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("专项返利sid")
+    private List<String> specialRebateSids; // 专项返利sid
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("专项返利预提申请sid")
+    private String mainSid; // 专项返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign <br/>
+ * Description: 专项返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利预提表")
+@FeignClient(
+        contextId = "anrui-scm-ScmSpecialRebateWith",
+        name = "anrui-scm",
+        path = "v1/scmspecialrebatewith",
+        fallback = ScmSpecialRebateWithFeignFallback.class)
+public interface ScmSpecialRebateWithFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmSpecialRebateWithVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeignFallback <br/>
+ * Description: 专项返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmSpecialRebateWithVo>> listPage(PagerQuery<ScmSpecialRebateWithQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatewith/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmSpecialRebateWithDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewith/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewith/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatewith/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery <br/>
+ * Description: 专项返利预提表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表 查询条件", description = "专项返利预提表 查询条件")
+public class ScmSpecialRebateWithQuery implements Query {
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("专项返利预提申请sid")
+    private String mainSid; // 专项返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo <br/>
+ * Description: 专项返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表 视图数据对象", description = "专项返利预提表 视图数据对象")
+public class ScmSpecialRebateWithVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+	@ApiModelProperty("专项返利预提申请sid")
+    private String mainSid; // 专项返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply <br/>
+ * Description: 专项返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提申请表", description = "专项返利预提申请表")
+@TableName("scm_special_rebate_with_apply")
+public class ScmSpecialRebateWithApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withApply; // 预提申请
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo <br/>
+ * Description: 专项返利预提申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提申请表 视图数据详情", description = "专项返利预提申请表 视图数据详情")
+public class ScmSpecialRebateWithApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withApply; // 预提申请
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("专项返利预提列表")
+    private List<ScmSpecialRebateWithDetailsVo> scmSpecialRebateWiths; // 专项返利预提列表
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto <br/>
+ * Description: 专项返利预提申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提申请表 数据传输对象", description = "专项返利预提申请表 数据传输对象")
+public class ScmSpecialRebateWithApplyDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withApply; // 预提申请
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("专项返利预提列表")
+    private List<ScmSpecialRebateWithDto> scmSpecialRebateWiths; // 专项返利预提列表
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java

@@ -0,0 +1,121 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyFeign <br/>
+ * Description: 专项返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利预提申请表")
+@FeignClient(
+        contextId = "anrui-scm-ScmSpecialRebateWithApply",
+        name = "anrui-scm",
+        path = "v1/scmspecialrebatewithapply",
+        fallback = ScmSpecialRebateWithApplyFeignFallback.class)
+public interface ScmSpecialRebateWithApplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**************************************专项返利预提审批流程*******************************************/
+
+    @ApiOperation("提交专项返利预提申请")
+    @PostMapping("/submitSpecialRebateWithApply")
+    public ResultBean submitSpecialRebateWithApply(@RequestBody @Valid SubmitScmSpecialRebateWithApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody ScmSpecialRebateWithApplyCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java

@@ -0,0 +1,117 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyFeignFallback <br/>
+ * Description: 专项返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmSpecialRebateWithApplyFeignFallback implements ScmSpecialRebateWithApplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(PagerQuery<ScmSpecialRebateWithApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatewithapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmSpecialRebateWithApplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewithapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewithapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmspecialrebatewithapply/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyQuery <br/>
+ * Description: 专项返利预提申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提申请表 查询条件", description = "专项返利预提申请表 查询条件")
+public class ScmSpecialRebateWithApplyQuery implements Query {
+
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("预提申请")
+    private String withApply; // 预提申请
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo <br/>
+ * Description: 专项返利预提申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提申请表 视图数据对象", description = "专项返利预提申请表 视图数据对象")
+public class ScmSpecialRebateWithApplyVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("预提申请")
+    private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
+    @ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/flow/GetNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/flow/GetNodeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/flow/ScmSpecialRebateWithApplyCompleteDto.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class ScmSpecialRebateWithApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+//    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables = new HashMap<>();
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/flow/ScmSpecialRebateWithApplyTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class ScmSpecialRebateWithApplyTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/flow/SubmitScmSpecialRebateWithApplyDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow;
+
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitScmSpecialRebateWithApplyDto extends ScmSpecialRebateWithApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,7 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
 	
 	@Select("select * from scm_special_rebate")
 	List<ScmSpecialRebateVo> selectListVo();
+
+	@Update("update from scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
+    void updateState(String specialRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@@ -82,7 +82,7 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		scmSpecialRebateService.delBySids(sids);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -103,6 +103,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
     public void insertByDto(ScmSpecialRebateDto dto) {
         ScmSpecialRebate entity = new ScmSpecialRebate();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setState(0);
         baseMapper.insert(entity);
     }
 
@@ -122,4 +123,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    public void updateState(String specialRebateSid) {
+        baseMapper.updateState(specialRebateSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyMapper <br/>
+ * Description: 专项返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper<ScmSpecialrebateCheckapply> {
+
+	//@Update("update scm_specialrebate_checkapply set name=#{msg} where id=#{id}")
+	//IPage<ScmSpecialrebateCheckapplyVo> voPage(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialrebateCheckapply> qw);
+	
+	IPage<ScmSpecialrebateCheckapplyVo> selectPageVo(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
+	
+	List<ScmSpecialrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
+	
+	@Select("select * from scm_specialrebate_checkapply")
+	List<ScmSpecialrebateCheckapplyVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@@ -0,0 +1,13 @@
+<?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.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
+		SELECT * FROM scm_specialrebate_checkapply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
+		SELECT * FROM scm_specialrebate_checkapply <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyRest <br/>
+ * Description: 专项返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利核对申请表")
+@RestController("com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyRest")
+@RequestMapping("v1/scmspecialrebatecheckapply")
+public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckapplyFeign {
+
+	@Autowired
+	private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmSpecialrebateCheckapplyVo> pv = scmSpecialrebateCheckapplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialrebateCheckapplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmSpecialrebateCheckapplyDetailsVo vo = scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyService <br/>
+ * Description: 专项返利核对申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpecialrebateCheckapplyMapper, ScmSpecialrebateCheckapply> {
+	private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmSpecialrebateCheckapply> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmSpecialrebateCheckapplyVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
+		ScmSpecialrebateCheckapplyQuery query = pq.getParams();
+		QueryWrapper<ScmSpecialrebateCheckapply> qw = createQueryWrapper(query);
+		IPage<ScmSpecialrebateCheckapply> page = PagerUtil.queryToPage(pq);
+		IPage<ScmSpecialrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmSpecialrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmSpecialrebateCheckapplyDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmSpecialrebateCheckapplyDto dto){
+		ScmSpecialrebateCheckapply entity = new ScmSpecialrebateCheckapply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmSpecialrebateCheckapplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmSpecialrebateCheckapply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmSpecialrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){
+		ScmSpecialrebateCheckapply entity = fetchBySid(sid);
+		ScmSpecialrebateCheckapplyDetailsVo vo = new ScmSpecialrebateCheckapplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailMapper <br/>
+ * Description: 专项返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSpecialrebateCheckapplydetail> {
+
+	//@Update("update scm_specialrebate_checkapplydetail set name=#{msg} where id=#{id}")
+	//IPage<ScmSpecialrebateCheckapplydetailVo> voPage(IPage<ScmSpecialrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialrebateCheckapplydetail> qw);
+	
+	IPage<ScmSpecialrebateCheckapplydetailVo> selectPageVo(IPage<ScmSpecialrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapplydetail> qw);
+	
+	List<ScmSpecialrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapplydetail> qw);
+	
+	@Select("select * from scm_specialrebate_checkapplydetail")
+	List<ScmSpecialrebateCheckapplydetailVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -0,0 +1,13 @@
+<?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.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
+		SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
+		SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailRest <br/>
+ * Description: 专项返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利核对申请表_返利列表")
+@RestController("com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailRest")
+@RequestMapping("v1/scmspecialrebatecheckapplydetail")
+public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateCheckapplydetailFeign {
+
+	@Autowired
+	private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmSpecialrebateCheckapplydetailVo> pv = scmSpecialrebateCheckapplydetailService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialrebateCheckapplydetailService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialrebateCheckapplydetailService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmSpecialrebateCheckapplydetailDetailsVo vo = scmSpecialrebateCheckapplydetailService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService <br/>
+ * Description: 专项返利核对申请表_返利列表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<ScmSpecialrebateCheckapplydetailMapper, ScmSpecialrebateCheckapplydetail> {
+	private QueryWrapper<ScmSpecialrebateCheckapplydetail> createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmSpecialrebateCheckapplydetail> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmSpecialrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq) {
+		ScmSpecialrebateCheckapplydetailQuery query = pq.getParams();
+		QueryWrapper<ScmSpecialrebateCheckapplydetail> qw = createQueryWrapper(query);
+		IPage<ScmSpecialrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
+		IPage<ScmSpecialrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmSpecialrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto){
+		ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){
+		ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid);
+		ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewith;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithMapper <br/>
+ * Description: 专项返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmSpecialRebateWithMapper extends BaseMapper<ScmSpecialRebateWith> {
+
+    //@Update("update scm_special_rebate_with set name=#{msg} where id=#{id}")
+    //IPage<ScmSpecialRebateWithVo> voPage(IPage<ScmSpecialRebateWith> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebateWith> qw);
+
+    IPage<ScmSpecialRebateWithVo> selectPageVo(IPage<ScmSpecialRebateWith> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWith> qw);
+
+    List<ScmSpecialRebateWithVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWith> qw);
+
+    @Select("select * from scm_special_rebate_with")
+    List<ScmSpecialRebateWithVo> selectListVo();
+
+    @Delete("delete from scm_special_rebate_with where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+    List<ScmSpecialRebateWithDetailsVo> fetchByMainSid(String sid);
+
+    @Select("select specialRebateSid from scm_special_rebate_with where mainSid = #{businessSid}")
+    List<String> fetchSpecialReBateSidByMainSid(String businessSid);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml

@@ -0,0 +1,32 @@
+<?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.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo">
+        SELECT * FROM scm_special_rebate_with
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo">
+        SELECT * FROM scm_special_rebate_with
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo">
+        SELECT ssr.rebateTypeKey,
+               ssr.`rebateTypeValue`,
+               SUM(ssr.`estimateRebate`)             withRebate,
+               COUNT(*)                              num,
+               GROUP_CONCAT(ssrw.`specialRebateSid`) specialRebateSid
+        FROM scm_special_rebate_with ssrw
+                     LEFT JOIN scm_special_rebate ssr
+                ON ssr.`sid` = ssrw.`specialRebateSid`
+        WHERE ssrw.`mainSid` = #{sid}
+        GROUP BY ssr.`calculationModeKey`
+    </select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewith;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithRest <br/>
+ * Description: 专项返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利预提表")
+@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithRest")
+@RequestMapping("v1/scmspecialrebatewith")
+public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
+
+	@Autowired
+	private ScmSpecialRebateWithService scmSpecialRebateWithService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmSpecialRebateWithVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmSpecialRebateWithVo> pv = scmSpecialRebateWithService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialRebateWithService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmSpecialRebateWithService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmSpecialRebateWithDetailsVo vo = scmSpecialRebateWithService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@@ -0,0 +1,122 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewith;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService <br/>
+ * Description: 专项返利预提表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRebateWithMapper, ScmSpecialRebateWith> {
+    private QueryWrapper<ScmSpecialRebateWith> createQueryWrapper(ScmSpecialRebateWithQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmSpecialRebateWith> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmSpecialRebateWithVo> listPageVo(PagerQuery<ScmSpecialRebateWithQuery> pq) {
+        ScmSpecialRebateWithQuery query = pq.getParams();
+        QueryWrapper<ScmSpecialRebateWith> qw = createQueryWrapper(query);
+        IPage<ScmSpecialRebateWith> page = PagerUtil.queryToPage(pq);
+        IPage<ScmSpecialRebateWithVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmSpecialRebateWithVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmSpecialRebateWithDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmSpecialRebateWithDto dto) {
+        ScmSpecialRebateWith entity = new ScmSpecialRebateWith();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmSpecialRebateWithDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmSpecialRebateWith entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmSpecialRebateWithDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmSpecialRebateWith entity = fetchBySid(sid);
+        ScmSpecialRebateWithDetailsVo vo = new ScmSpecialRebateWithDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<ScmSpecialRebateWithDetailsVo> fetchByMainSid(String sid) {
+        return baseMapper.fetchByMainSid(sid);
+    }
+
+    public List<String> fetchSpecialReBateSidByMainSid(String businessSid) {
+        return baseMapper.fetchSpecialReBateSidByMainSid(businessSid);
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewithapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyMapper <br/>
+ * Description: 专项返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmSpecialRebateWithApplyMapper extends BaseMapper<ScmSpecialRebateWithApply> {
+
+	//@Update("update scm_special_rebate_with_apply set name=#{msg} where id=#{id}")
+	//IPage<ScmSpecialRebateWithApplyVo> voPage(IPage<ScmSpecialRebateWithApply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebateWithApply> qw);
+	
+	IPage<ScmSpecialRebateWithApplyVo> selectPageVo(IPage<ScmSpecialRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWithApply> qw);
+	
+	List<ScmSpecialRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWithApply> qw);
+	
+	@Select("select * from scm_special_rebate_with_apply")
+	List<ScmSpecialRebateWithApplyVo> selectListVo();
+
+	int selectBySid(String join);
+
+	int updateFlowFiled(Map<String, Object> beanToMap);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@@ -0,0 +1,51 @@
+<?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.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
+        SELECT
+        ssrwa.*,
+        SUM(ssr.`estimateRebate`) withRebateTotal
+        FROM
+        scm_special_rebate_with_apply ssrwa
+        LEFT JOIN scm_special_rebate_with ssrw
+        ON ssrwa.`sid` = ssrw.`mainSid`
+        LEFT JOIN scm_special_rebate ssr
+        ON ssr.`sid` = ssrw.`specialRebateSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY ssrwa.sid
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
+        SELECT * FROM scm_special_rebate_with_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM scm_special_rebate_with_apply
+        WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
+
+    <update id="updateFlowFiled">
+        UPDATE scm_special_rebate_with_apply
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid=#{sid}
+    </update>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java

@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewithapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyFeign;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyRest <br/>
+ * Description: 专项返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "专项返利预提申请表")
+@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyRest")
+@RequestMapping("v1/scmspecialrebatewithapply")
+public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyFeign {
+
+	@Autowired
+	private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmSpecialRebateWithApplyVo> pv = scmSpecialRebateWithApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto){
+		return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return scmSpecialRebateWithApplyService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid);
+	}
+
+	@Override
+	public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
+		return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto);
+	}
+
+	@Override
+	public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(dto, bv);
+		bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
+		return scmSpecialRebateWithApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return scmSpecialRebateWithApplyService.taskReject(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return scmSpecialRebateWithApplyService.flowRecord(procInsId);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -0,0 +1,442 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmspecialrebatewithapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
+import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
+import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithApplyService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService <br/>
+ * Description: 专项返利预提申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpecialRebateWithApplyMapper, ScmSpecialRebateWithApply> {
+
+    @Autowired
+    private ScmSpecialRebateWithService scmSpecialRebateWithService;
+    @Autowired
+    private ScmSpecialRebateService scmSpecialRebateService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    private QueryWrapper<ScmSpecialRebateWithApply> createQueryWrapper(ScmSpecialRebateWithApplyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmSpecialRebateWithApply> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmSpecialRebateWithApplyVo> listPageVo(PagerQuery<ScmSpecialRebateWithApplyQuery> pq) {
+        ScmSpecialRebateWithApplyQuery query = pq.getParams();
+        QueryWrapper<ScmSpecialRebateWithApply> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("svrwa.brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getWithApply())) {
+            qw.like("svrwa.withApply", query.getWithApply());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
+        qw.orderByDesc("svrwa.createTime");
+        IPage<ScmSpecialRebateWithApply> page = PagerUtil.queryToPage(pq);
+        IPage<ScmSpecialRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmSpecialRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<String> saveOrUpdateDto(ScmSpecialRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<ScmSpecialRebateWithDto> scmSpecialRebateWiths = dto.getScmSpecialRebateWiths();
+        if (scmSpecialRebateWiths == null) {
+            return rb.setMsg("请选择专项返利信息");
+        }
+        if (StringUtils.isBlank(dtoSid)) {
+            String sid = this.insertByDto(dto).getData();
+            for (ScmSpecialRebateWithDto scmSpecialRebateWithDto : scmSpecialRebateWiths) {
+                List<String> specialRebateSids = scmSpecialRebateWithDto.getSpecialRebateSids();
+                for (String specialRebateSid : specialRebateSids) {
+                    ScmSpecialRebateWith scmSpecialRebateWith = new ScmSpecialRebateWith();
+                    scmSpecialRebateWith.setSpecialRebateSid(specialRebateSid);
+                    scmSpecialRebateWith.setMainSid(sid);
+                    scmSpecialRebateWithService.save(scmSpecialRebateWith);
+                }
+            }
+            return rb.success().setMsg("添加成功").setData(sid);
+        }
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(dtoSid);
+        if (scmSpecialRebateWithApply == null) {
+            rb.setMsg("该专项返利预提申请单不存在");
+        }
+        this.updateByDto(dto);
+        scmSpecialRebateWithService.delByMainSid(dtoSid);
+        for (ScmSpecialRebateWithDto scmSpecialRebateWithDto : scmSpecialRebateWiths) {
+            List<String> specialRebateSids = scmSpecialRebateWithDto.getSpecialRebateSids();
+            for (String specialRebateSid : specialRebateSids) {
+                ScmSpecialRebateWith scmSpecialRebateWith = new ScmSpecialRebateWith();
+                scmSpecialRebateWith.setSpecialRebateSid(specialRebateSid);
+                scmSpecialRebateWith.setMainSid(dtoSid);
+                scmSpecialRebateWithService.save(scmSpecialRebateWith);
+            }
+        }
+        return rb.success().setMsg("修改成功").setData(dtoSid);
+    }
+
+    public ResultBean<String> insertByDto(ScmSpecialRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateWithApply entity = new ScmSpecialRebateWithApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
+        baseMapper.insert(entity);
+        return rb.success().setData(entity.getSid());
+    }
+
+    public void updateByDto(ScmSpecialRebateWithApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmSpecialRebateWithApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmSpecialRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmSpecialRebateWithApply entity = fetchBySid(sid);
+        ScmSpecialRebateWithApplyDetailsVo vo = new ScmSpecialRebateWithApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            scmSpecialRebateWithService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateWithApplyDetailsVo scmSpecialRebateWithApplyDetailsVo = new ScmSpecialRebateWithApplyDetailsVo();
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(sid);
+        BeanUtil.copyProperties(scmSpecialRebateWithApply, scmSpecialRebateWithApplyDetailsVo);
+        List<ScmSpecialRebateWithDetailsVo> scmSpecialRebateWithDetailsVos = scmSpecialRebateWithService.fetchByMainSid(sid);
+        for (ScmSpecialRebateWithDetailsVo scmSpecialRebateWithDetailsVo : scmSpecialRebateWithDetailsVos) {
+            String[] specialRebateSids = scmSpecialRebateWithDetailsVo.getSpecialRebateSid().split(",");
+            scmSpecialRebateWithDetailsVo.setSpecialRebateSids(Arrays.asList(specialRebateSids));
+            String withRebate = scmSpecialRebateWithDetailsVo.getWithRebate();
+            withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
+            scmSpecialRebateWithDetailsVo.setWithRebate(withRebate);
+        }
+        scmSpecialRebateWithApplyDetailsVo.setScmSpecialRebateWiths(scmSpecialRebateWithDetailsVos);
+        return rb.success().setData(scmSpecialRebateWithApplyDetailsVo);
+    }
+
+    public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, scmSpecialRebateWithApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //=====================添加app所需参数
+        Map<String,Object> appMap = new HashMap<>();
+        appMap.put("sid",businessSid);
+        variables.put("app",appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(scmSpecialRebateWithApply.getTaskId());
+            bv.setTaskDefKey(scmSpecialRebateWithApply.getNodeSid());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitScmSpecialRebateWithApplyDto dto, ScmSpecialRebateWithApply scmSpecialRebateWithApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (scmSpecialRebateWithApply != null) {
+                String businessTaskId = scmSpecialRebateWithApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());
+        List<String> specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(scmSpecialRebateWithApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (String specialRebateSid : specialRebateSids) {
+                    scmSpecialRebateService.updateState(specialRebateSid);
+                }
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean revokeProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询排内购申请
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmSpecialRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                flowTaskVo.setValues(BeanUtil.beanToMap(scmSpecialRebateWithApply));
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean taskReject(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(query.getBusinessSid());
+        if (scmSpecialRebateWithApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = scmSpecialRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmSpecialRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean flowRecord(String procInsId) {
+        return flowTaskFeign.businessFlowRecord(procInsId);
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -116,6 +116,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
         qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
+        qw.orderByDesc("svrwa.createTime");
         IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmVehRebateWithApplyVo record : pagging.getRecords()) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java

@@ -32,4 +32,6 @@ public class OrderModelInfoVo implements Vo {
     private List<String> orderList;
     @ApiModelProperty(value = "合计数量")
     private String total;
+
+    private String specialInstructions;
 }