feat: 返利模板调整

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java

@@ -60,6 +60,12 @@ public class TbsActivityTemplateController {
     @GetMapping("/list")
     @PreAuthorize("hasRole('tbs:activityTemplate:query')")
     public R<List<TbsActivityTemplate>> getList(TbsActivityTemplateSo param){
+        // 如果传 -1 则查询所有
+        if(param.getTemplateType()==null){
+            param.setTemplateType(0);
+        }else if(param.getTemplateType()== -1){
+            param.setTemplateType(null);
+        }
         TbsActivityTemplate entity = CopierUtil.copy(param,new TbsActivityTemplate());
         LambdaQueryWrapper<TbsActivityTemplate> lqw = new LambdaQueryWrapper<>(entity);
         lqw.orderByDesc(TbsActivityTemplate::getTemplateState);
@@ -76,6 +82,12 @@ public class TbsActivityTemplateController {
     @GetMapping("/page")
     @PreAuthorize("hasRole('tbs:activityTemplate:query')")
     public R<PageVo<TbsActivityTemplate>> getPage(TbsActivityTemplateSo param){
+        // 如果传 -1 则查询所有
+        if(param.getTemplateType()==null){
+            param.setTemplateType(0);
+        }else if(param.getTemplateType()== -1){
+            param.setTemplateType(null);
+        }
         TbsActivityTemplate entity = CopierUtil.copy(param,new TbsActivityTemplate());
         LambdaQueryWrapper<TbsActivityTemplate> lqw = new LambdaQueryWrapper<>(entity);
         lqw.orderByDesc(TbsActivityTemplate::getId);
@@ -229,8 +241,11 @@ public class TbsActivityTemplateController {
      * @return
      */
     @GetMapping("/listMyTemplate")
-    public R<PageVo<TbsActivityTemplate>> listMyTemplate(String templateName,Integer contractFlag){
+    public R<PageVo<TbsActivityTemplate>> listMyTemplate(String templateName,Integer contractFlag,Integer templateType){
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = buildMyTempQueryWrapper(templateName);
+        if (templateType == null){
+            tmpLqw.eq(TbsActivityTemplate::getTemplateType,0);
+        }
         if(contractFlag!=null){
             tmpLqw.eq(TbsActivityTemplate::getContractFlag,contractFlag);
         }
@@ -244,8 +259,11 @@ public class TbsActivityTemplateController {
      * @return
      */
     @GetMapping("/countMyTemplate")
-    public R<Long> countMyTemplate(String templateName){
+    public R<Long> countMyTemplate(String templateName,Integer templateType){
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = buildMyTempQueryWrapper(templateName);
+        if (templateType == null){
+            tmpLqw.eq(TbsActivityTemplate::getTemplateType,0);
+        }
         Long count = tbsActivityTemplateService.count(tmpLqw);
         return R.ok(count);
     }

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateSo.java

@@ -25,6 +25,12 @@ public class TbsActivityTemplateSo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * -1 query all
+     * 模板类型：0-费用申请(默认)；1-返利申请
+     */
+    private Integer templateType;
+
     /** 供应商id */
     private Long supplierId;
 

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java

@@ -371,7 +371,7 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
             TzcRebateLevelsArgument argument2 = buildArgByParam(levelsParam.getTargetArgument());
             argument2.setBusinessType(TzcArgTypes.LevelReturn.name());
             argument2.setLevelId(levelId);
-            argument.setRebateId(rebateId);
+            argument2.setRebateId(rebateId);
             tzcRebateLevelsArgumentService.save(argument2);
 
             argumentList.add(argument);