From a5ce42012d6b934a68d0f2a51d0ae6f9d2030d0e Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 6 Apr 2023 16:34:03 +0800 Subject: [PATCH] debug --- .../biz/controller/BizCusVisitController.java | 14 ++++---------- .../modules/biz/controller/api/BizCusVisitApi.java | 2 ++ .../goods/controller/GoodsSpuController.java | 10 +++++----- .../impl/TzcPolicyApplicationServiceImpl.java | 7 +++++-- .../serve/modules/wx/common/conf/WxMpConfig.java | 2 ++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java index 83cf54c4..fb40fdd2 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.util.List; /** - * 业务 拜访日志 + * 业务 客户拜访日志 * @author YenHex * @since 2023-03-24 */ @@ -38,8 +38,7 @@ public class BizCusVisitController { * @param param * @return */ - //@GetMapping("/list") - @PreAuthorize("hasRole('biz:cusVisit:query')") + @GetMapping("/list") public R> getList(BizCusVisit param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); @@ -52,8 +51,7 @@ public class BizCusVisitController { * @param param * @return */ - //@GetMapping("/page") - @PreAuthorize("hasRole('biz:cusVisit:query')") + @GetMapping("/page") public R> getPage(BizCusVisit param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); lqw.orderByDesc(BizCusVisit::getId); @@ -67,9 +65,8 @@ public class BizCusVisitController { * @param id * @return */ - //@GetMapping("/getById/{id}") + @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BIZ, title = "拜访日志", biz = BizType.QUERY) - @PreAuthorize("hasRole('biz:cusVisit:query')") public R getById(@PathVariable("id") String id){ BizCusVisit bizCusVisit = bizCusVisitService.getById(id); return R.ok(bizCusVisit); @@ -84,7 +81,6 @@ public class BizCusVisitController { */ //@PostMapping("/updateById") @SysLog(module = SystemModule.BIZ, title = "拜访日志", biz = BizType.UPDATE) - @PreAuthorize("hasRole('biz:cusVisit:update')") public R updateById(@RequestBody @Valid BizCusVisit param){ boolean result = bizCusVisitService.updateById(param); return R.isTrue(result); @@ -97,7 +93,6 @@ public class BizCusVisitController { */ //@PostMapping("/save") @SysLog(module = SystemModule.BIZ, title = "拜访日志", biz = BizType.INSERT) - @PreAuthorize("hasRole('biz:cusVisit:insert')") public R save(@RequestBody @Valid BizCusVisit param){ boolean result = bizCusVisitService.save(param); return R.isTrue(result); @@ -110,7 +105,6 @@ public class BizCusVisitController { */ @DeleteMapping("/deleteById/{ids}") @SysLog(module = SystemModule.BIZ, title = "拜访日志", biz = BizType.DELETE) - @PreAuthorize("hasRole('biz:cusVisit:delete')") public R deleteById(@PathVariable("ids") String ids){ List idsLong = StringUtils.splitIdLong(ids); boolean result = bizCusVisitService.removeByIds(idsLong); diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java index 740e5372..3dffe1c6 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java @@ -64,6 +64,7 @@ public class BizCusVisitApi { param.setVisitorId(userId); PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); + visitWrapper.orderByDesc(BizCusVisit::getCreateTime); List list = bizVisitService.list(visitWrapper); return R.byPageHelperList(list); } @@ -82,6 +83,7 @@ public class BizCusVisitApi { PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); visitWrapper.in(BizCusVisit::getVisitorId,userIds); + visitWrapper.orderByDesc(BizCusVisit::getCreateTime); List list = bizVisitService.list(visitWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 58ac8558..9444f2e8 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -87,11 +87,11 @@ public class GoodsSpuController { public R> getPage(GoodsSpu param){ PageUtil.startPage(); List list = goodsSpuService.selectSpuList(param); - for (GoodsSpu goodsSpu : list) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(GoodsSku::getSpuId,goodsSpu.getId()); - goodsSkuService.list(lqw); - } +// for (GoodsSpu goodsSpu : list) { +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// lqw.eq(GoodsSku::getSpuId,goodsSpu.getId()); +// goodsSkuService.list(lqw); +// } return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index c4a59c33..98902fec 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -352,12 +352,15 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ //所有满足条件的考核期，用于加载历史核销费用,并设置不满足时间条件的预算 List scheduleItemList = this.loadScheduleBudgetAndSetting(policyItemList, budgetIds, noBudgetPolicyIds); List centerIds = policyItemList.stream().map(TzcPolicyItem::getCenterId).collect(Collectors.toList()); - List subjectIds = policyItemList.stream().map(TzcPolicyItem::getSubjectId).distinct().collect(Collectors.toList()); + //默认为随货折让 + //List subjectIds = policyItemList.stream().map(TzcPolicyItem::getSubjectId).distinct().collect(Collectors.toList()); List budgetList; if(budgetIds.size()>0){ LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); budgetLqw.in(TbsBudget::getId,budgetIds); - budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); + //默认为随货折让(FYMC05) + //budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); + budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.eq(TbsBudget::getSubjectCode,"FYMC05"))); budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.eq(TbsBudget::getBudgetState,1); budgetList = tbsBudgetMapper.selectList(budgetLqw); diff --git a/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java b/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java index a83cf14e..bc26d441 100644 --- a/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java +++ b/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java @@ -16,6 +16,7 @@ import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import java.util.List; import java.util.stream.Collectors; @@ -51,6 +52,7 @@ public class WxMpConfig { private final RedisProperties redisProperties; @Bean + @Scope(value = "singleton") public WxMpService wxMpService() { //超时时间 LambdaQueryWrapper appWrapper = new LambdaQueryWrapper<>();