From 654215e3dd6957016e52e38174d62bc0944bb3c7 Mon Sep 17 00:00:00 2001 From: 19991905653 Date: Tue, 27 Feb 2024 20:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MerchantCashierCounteController.java | 2 +- .../channel/ys/impl/YSAuditServiceV3.java | 15 ++++++--- .../platform/task/LklMerAuditHandler.java | 13 +++++--- .../platform/task/SxfMerAuditHandler.java | 31 ++++++++++++------- 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashierCounteController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashierCounteController.java index 3c5fbcf..165d777 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashierCounteController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashierCounteController.java @@ -66,7 +66,7 @@ public class MerchantCashierCounteController { * @return */ @GetMapping("/list") - public Result list(@RequestParam Integer current, @RequestParam Integer size, @RequestParam String name) { + public Result list(@RequestParam Integer current, @RequestParam Integer size, String name) { UserApp userApp = userAppService.queryUserAppByToken(); PageInfo result = merchantCashierCounteService.selectList(current,size,userApp.getUserId(),name); return ResultGenerator.genSuccessResult(result); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java index 81c2b47..693270b 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java @@ -136,6 +136,8 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer private MerchantChannelStatusMapper merchantChannelStatusMapper; @Setter(onMethod_ = {@Autowired}) private UserInfoMapper userInfoMapper; + @Setter(onMethod_ = {@Autowired}) + private MerchantChannelMapper merchantChannelMapper; @Override public void merchantAuditV3(String userId, boolean isFailCheck, Integer channel) { try { @@ -335,7 +337,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer } } - private void addCash(MerchantChannelStatus mcs) { + private void addCash(MerchantChannelStatus mcs,Integer channl) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status", "3"); queryWrapper.eq("merchantCode", mcs.getMerchantCode()); @@ -351,11 +353,14 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer merchantCashPlace.setAddress(merchantBaseInfo.getAddress()); merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId())); merchantCashPlace.setName("收银点一"); - merchantCashPlace.setPayPassageId(mcs.getChannel()); - merchantCashPlace.setPayPassageName(mcs.getChannelName()); + merchantCashPlace.setPayPassageId(channl); + MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl); + if (Objects.nonNull(merchantChannel)){ + merchantCashPlace.setPayPassageName(merchantChannel.getChannelName()); + } merchantCashPlace.setCreateTime(new Date()); merchantCashPlace.setName(merchantBaseInfo.getAlias()); - merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId())); + merchantCashPlace.setRootAccountId(merchantCashPlace.getUserId()); merchantCashPlace.setCode(getCode()); merchantCashPlaceMapper.insert(merchantCashPlace); UserInfo userInfo = userInfoMapper.selectById(merchantBaseInfo.getUserId()); @@ -839,7 +844,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer bizContentMap.put("appletId", "wxfc7bd92a462eb191"); ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap,channel); try { - addCash(mcs); + addCash(mcs,4); }catch (Exception e){ log.info("创建店铺信息异常,异常信息:{}", e.getMessage()); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java index db446fe..ad9e793 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java @@ -105,6 +105,8 @@ public class LklMerAuditHandler { @Setter(onMethod_ = {@Autowired}) private MerchantBaseInfoMapper merchantBaseInfoMapper; @Setter(onMethod_ = {@Autowired}) + private MerchantChannelMapper merchantChannelMapper; + @Setter(onMethod_ = {@Autowired}) private MerchantCashPlaceMapper merchantCashPlaceMapper; @Setter(onMethod_ = {@Autowired}) private UserCashPlaceMapper userCashPlaceMapper; @@ -135,7 +137,7 @@ public class LklMerAuditHandler { self.createStore(mcs); try { - addCash(mcs); + addCash(mcs,5); }catch (Exception e){ log.info("创建店铺信息异常,异常信息:{}", e.getMessage()); } @@ -157,7 +159,7 @@ public class LklMerAuditHandler { } - private void addCash(MerchantChannelStatus mcs) { + private void addCash(MerchantChannelStatus mcs, int channl) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status", "3"); queryWrapper.eq("merchantCode", mcs.getMerchantCode()); @@ -173,8 +175,11 @@ public class LklMerAuditHandler { merchantCashPlace.setAddress(merchantBaseInfo.getAddress()); merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId())); merchantCashPlace.setName("收银点一"); - merchantCashPlace.setPayPassageId(mcs.getChannel()); - merchantCashPlace.setPayPassageName(mcs.getChannelName()); + merchantCashPlace.setPayPassageId(channl); + MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl); + if (Objects.nonNull(merchantChannel)){ + merchantCashPlace.setPayPassageName(merchantChannel.getChannelName()); + } merchantCashPlace.setCreateTime(new Date()); merchantCashPlace.setName(merchantBaseInfo.getAlias()); merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId())); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java index 4fe6540..1d97283 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java @@ -71,6 +71,8 @@ public class SxfMerAuditHandler { private UserCashPlaceMapper userCashPlaceMapper; @Setter(onMethod_ = {@Autowired}) private MerchantChannelStatusMapper merchantChannelStatusMapper; + @Setter(onMethod_ = {@Autowired}) + private MerchantChannelMapper merchantChannelMapper; @Setter(onMethod_ = {@Autowired, @Lazy}) private MerchantCashPlaceService cashPlaceService; @@ -109,32 +111,32 @@ public class SxfMerAuditHandler { log.info("===================>(餐饮商超)进件回调，创建店铺开始,商户编号mno为:{}<=====================", auditResult.getString("mno")); self.createStore(mcs); try { - addCash(mcs); + addCash(mcs,1); }catch (Exception e){ - log.info("创建店铺信息异常,异常信息:{}", e.getMessage()); + log.info("创建店铺信息异常,异常信息创建默认收银点失败,异常信息:{}", e.getMessage()); } } catch (Exception e) { e.printStackTrace(); log.info("创建店铺信息异常,异常信息:{}", e.getMessage()); } - try { - MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode()); - if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) { - cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId())); - } - } catch (Exception e) { - LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}"); - } +// try { +// MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode()); +// if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) { +// cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId())); +// } +// } catch (Exception e) { +// LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}"); +// } } - private void addCash(MerchantChannelStatus mcs){ + private void addCash(MerchantChannelStatus mcs, int channl){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status","3"); queryWrapper.eq("merchantCode",mcs.getMerchantCode()); // queryWrapper.eq("channel") long num = merchantChannelStatusMapper.selectCount(queryWrapper); - if (num < 1){ + if (num < 2){ QueryWrapper baseInfoQueryWrapper = new QueryWrapper<>(); baseInfoQueryWrapper.eq("merchantCode",mcs.getMerchantCode()); List list = merchantBaseInfoMapper.selectList(baseInfoQueryWrapper); @@ -144,6 +146,11 @@ public class SxfMerAuditHandler { merchantCashPlace.setAddress(merchantBaseInfo.getAddress()); merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId())); merchantCashPlace.setName("收银点一"); + merchantCashPlace.setPayPassageId(channl); + MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl); + if (Objects.nonNull(merchantChannel)){ + merchantCashPlace.setPayPassageName(merchantChannel.getChannelName()); + } merchantCashPlace.setPayPassageId(mcs.getChannel()); merchantCashPlace.setPayPassageName(mcs.getChannelName()); merchantCashPlace.setCreateTime(new Date());