From e96aac959e893a655fe6b3c039dbf81a412275bd Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Thu, 14 Dec 2023 13:28:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E9=80=82=E9=85=8Dmq+rocketutil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/CommissionRecordService.java | 1 + .../impl/CommissionRecordServiceImpl.java | 6 + .../controller/IntegralOrdersController.java | 6 + .../integral/entity/IntegralSettings.java | 4 + .../mapper/xml/IntegralDetailMapper.xml | 5 +- .../service/IntegralOrdersService.java | 2 + .../impl/IntegralOrdersServiceImpl.java | 75 ++++++- .../impl/IntegralSettingsServiceImpl.java | 57 +++-- .../integral/vo/IntegralOrdersRequest.java | 17 ++ .../mapper/xml/CardFuelRecordMapper.xml | 3 +- .../service/CardFuelChangeService.java | 1 + .../impl/CardFuelChangeServiceImpl.java | 5 + .../impl/CardFuelRecordServiceImpl.java | 13 +- .../impl/CardValueRecordServiceImpl.java | 72 ++++-- .../mapper/xml/CardBalanceChangeMapper.xml | 1 + .../service/CardBalanceChangeService.java | 2 + .../impl/CardBalanceChangeServiceImpl.java | 6 + .../controller/RocketmqRecordController.java | 93 ++++++++ .../record/entity/RocketmqRecord.java | 71 ++++++ .../record/mapper/RocketmqRecordMapper.java | 85 +++++++ .../mapper/xml/RocketmqRecordMapper.xml | 209 ++++++++++++++++++ .../record/service/RocketmqRecordService.java | 58 +++++ .../impl/RocketmqRecordServiceImpl.java | 89 ++++++++ .../userManager/mapper/LJUserMapper.java | 2 + .../userManager/mapper/xml/LJUserMapper.xml | 13 ++ .../config/MQConsumerConfiguration.java | 86 ++++++- .../config/MQProducerConfiguration.java | 77 ++++++- .../fuint/common/config/RedissonConfig.java | 50 ++++- .../common/util/DistributedLockUtil.java | 78 ++++++- .../java/com/fuint/common/util/RedisLock.java | 115 +++++++++- .../util/RocketSendCallbackListener.java | 8 +- .../com/fuint/common/util/RocketUtil.java | 99 ++++++++- 32 files changed, 1350 insertions(+), 59 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java index 2a91c040d..77779c3a2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java @@ -38,6 +38,7 @@ public interface CommissionRecordService { * @return 实例对象 */ CommissionRecord insert(CommissionRecord commissionRecord); + CommissionRecord insert2(CommissionRecord commissionRecord); /** * 修改数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java index b741d4a99..6031554a6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java @@ -64,6 +64,12 @@ public class CommissionRecordServiceImpl implements CommissionRecordService { return commissionRecord; } + @Override + public CommissionRecord insert2(CommissionRecord commissionRecord) { + return commissionRecord; + } + + /** * 修改数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java index 682e7b541..645d75b03 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java @@ -160,5 +160,11 @@ public class IntegralOrdersController extends BaseController { return getSuccessResult(this.integralOrdersService.checkTheStatusOfYourPaymentByIntegral(orderNumber)); } + + @PostMapping("integralOrdersProcessingUni") + public ResponseObject integralOrdersProcessingUni(@RequestBody IntegralOrdersRequest integralOrdersList) { + return getSuccessResult(this.integralOrdersService.integralOrdersProcessingUni(integralOrdersList)); + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java index ca3930614..be184e084 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java @@ -89,6 +89,10 @@ public class IntegralSettings extends BaseEntity { * 店铺ID */ private Integer storeId; + /** + * 连锁店id + */ + private Integer chainStoreId; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml index 601c7888b..6390f920c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml @@ -92,8 +92,8 @@ - insert into integral_detail(user_id, points_change, current_points, type, change_reason, store_id, create_time, update_time, create_by, update_by,change_type) - values (#{userId}, #{pointsChange}, #{currentPoints}, #{type}, #{changeReason}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{changeType}) + insert into integral_detail(user_id, points_change, current_points, type, change_reason, store_id, create_time, update_time, create_by, update_by,change_type,chain_store_id) + values (#{userId}, #{pointsChange}, #{currentPoints}, #{type}, #{changeReason}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{changeType}, #{chainStoreId}) @@ -187,6 +187,7 @@ and type = #{type} +order by create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java index daf97514b..f53898367 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java @@ -72,5 +72,7 @@ public interface IntegralOrdersService { int editPayStatus(String orderNumber, String payStates,Integer storeId); + IntegralOrders integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java index 5dd9fad20..9acba4c7f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java @@ -147,9 +147,17 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { @Override @Transactional public IntegralOrders integralOrdersProcessing(IntegralOrdersRequest integralOrdersList) { + double epsilon = 1e-10; // 阈值 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + // 当为小程序下单时 + if (ObjectUtil.isNotEmpty(integralOrdersList.getOrderChannel()) & integralOrdersList.getOrderChannel() == -1) { + nowAccountInfo.setChainStoreId(integralOrdersList.getChainStoreId()); + nowAccountInfo.setStoreId(integralOrdersList.getStoreId()); + integralOrdersList.getIntegralOrdersList().get(0).setUserId(nowAccountInfo.getId()); + } // 首先判断是否足够积分 - LJUserVo ljUserVos = ljUserMapper.selectAllInfoById(integralOrdersList.getIntegralOrdersList().get(0).getUserId()); + LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(integralOrdersList.getIntegralOrdersList().get(0).getUserId(),nowAccountInfo.getChainStoreId()); if (ljUserVos.getPoints() < integralOrdersList.getAllPoints()) { integralOrdersList.getIntegralOrdersList().get(0).setStatus("un"); return integralOrdersList.getIntegralOrdersList().get(0); @@ -158,11 +166,10 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { List integralOrdersList1 = integralOrdersList.getIntegralOrdersList(); if (integralOrdersList1.size()<0) return null; - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); String status = "unpaid"; // 添加储存充值 - if ("CASH".equals(integralOrdersList.getPaymentType())) { + if ("CASH".equals(integralOrdersList.getPaymentType()) || integralOrdersList.getAllAmout() <= epsilon) { status = "paid"; }else { status = "unpaid"; @@ -171,19 +178,20 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String timestamp = dateFormat.format(new Date()); String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6); - String orderNo = timestamp+randomString; + String orderNo = "2345"+timestamp+randomString; // 生成订单编号 for (IntegralOrders integralOrders : integralOrdersList1) { integralOrders.setStoreId(nowAccountInfo.getStoreId()); - integralOrders.setCreateBy(nowAccountInfo.getStaffId().toString()); + if (ObjectUtil.isNotEmpty(nowAccountInfo.getStaffId())) { + integralOrders.setCreateBy(nowAccountInfo.getStaffId().toString()); + } integralOrders.setOrderNumber(orderNo); integralOrders.setStatus(status); } integralOrdersDao.insertBatch(integralOrdersList.getIntegralOrdersList()); - double epsilon = 1e-10; // 阈值 boolean flag = false; if (!ObjectUtil.isEmpty(integralOrdersList.getAllAmout()) @@ -288,4 +296,59 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { return integralOrdersDao.editPayStatus(orderNumber,payStates,storeId); } + @Override + public IntegralOrders integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) { + double epsilon = 1e-10; // 阈值 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + + // 首先判断是否足够积分 + LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(nowAccountInfo.getId(),integralOrdersList.getChainStoreId()); + if (ljUserVos.getPoints() < integralOrdersList.getAllPoints()) { + integralOrdersList.getIntegralOrdersList().get(0).setStatus("un"); + return integralOrdersList.getIntegralOrdersList().get(0); + } + + // 插入订单 + List integralOrdersList1 = integralOrdersList.getIntegralOrdersList(); + if (integralOrdersList1.size()<0) return null; + + String status = "unpaid"; + // 添加储存充值 + if ("CASH".equals(integralOrdersList.getPaymentType()) || integralOrdersList.getAllAmout() <= epsilon) { + status = "paid"; + }else { + status = "unpaid"; + } + // 根据日期生成支付编号 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + String timestamp = dateFormat.format(new Date()); + String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6); + String orderNo = timestamp+randomString; + + // 生成订单编号 + for (IntegralOrders integralOrders : integralOrdersList1) { + integralOrders.setStoreId(nowAccountInfo.getStoreId()); + if (ObjectUtil.isNotEmpty(nowAccountInfo.getStaffId())) { + integralOrders.setCreateBy(nowAccountInfo.getStaffId().toString()); + } + + integralOrders.setOrderNumber(orderNo); + integralOrders.setStatus(status); + } + integralOrdersDao.insertBatch(integralOrdersList.getIntegralOrdersList()); + + boolean flag = false; + + if (!ObjectUtil.isEmpty(integralOrdersList.getAllAmout()) + && integralOrdersList.getAllAmout() > epsilon + && "unpaid".equals(status)){ + flag = true; + } + + // 支付 + if (flag) {} + + return null; + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 22c1ec7ec..e9792f9f8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -229,9 +229,11 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { if (integer == 0) { // 根据店铺id 查找连锁店id - LJStore ljStore = iljStoreService.selectStoreByIdUni(integralSettings.getStoreId()); +// LJStore ljStore = iljStoreService.selectStoreByIdUni(integralSettings.getStoreId()); // 查询当前用户 - LJUserVo ljUserVos = ljUserMapper.selectAllInfoById4Chain(nowAccountInfo.getId(),ljStore.getChainStoreId()); + LJUserVo ljUserVos = ljUserMapper.selectAllInfoById4Chain(nowAccountInfo.getId(),integralSettings.getChainStoreId()); + ljUserVos.setChainStoreId(integralSettings.getChainStoreId()); + ljUserVos.setStoreId(integralSettings.getStoreId()); // 查询积分配置 IntegralSettings integralSetting = integralSettingsMapper.getByStoreId(integralSettings.getStoreId()); @@ -240,37 +242,55 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { // 查询昨天是否签到 List signInGifts = integralDetailMapper.signInGiftsYesterday("签到赠送"); - IntegralDetail integralDetail = new IntegralDetail(); - integralDetail.setStoreId(integralSettings.getStoreId()); - if (ObjectUtil.isEmpty(signInGifts)) { - extracted(nowAccountInfo, ljUserVos, jsonArray, integralDetail, 0); + extracted(ljUserVos, jsonArray, 0); } else { String changeReason = signInGifts.get(0).getChangeReason(); - // 获取字符串的第4位字符（索引为3） - char dayChar = changeReason.charAt(3); - // 将字符转换为整数 - int dayInt = Character.getNumericValue(dayChar); +// // 获取字符串的第4位字符（索引为3） +// char dayChar = changeReason.charAt(3); +// // 将字符转换为整数 +// int dayInt = Character.getNumericValue(dayChar); + + + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < changeReason.length(); i++) { + if (Character.isDigit(changeReason.charAt(i))) { + sb.append(changeReason.charAt(i)); + } + } + + int dayInt = Integer.parseInt(sb.toString()); // 签到超8天处理 - if (dayInt >= 8 && 8<= jsonArray.size()) { - extracted(nowAccountInfo, ljUserVos, jsonArray, integralDetail, dayInt); - } else if (dayInt >= 1 && dayInt <= jsonArray.size()) { - extracted(nowAccountInfo, ljUserVos, jsonArray, integralDetail, dayInt); - } +// if (dayInt > 8 && 8< jsonArray.size()) { +// extracted(ljUserVos, jsonArray, dayInt); +// } else if (dayInt >= 1 && dayInt <= jsonArray.size()) { + extracted(ljUserVos, jsonArray, dayInt); +// } } } return null; } - private void extracted(AccountInfo nowAccountInfo, LJUserVo ljUserVos, JSONArray jsonArray, IntegralDetail integralDetail, int dayInt) { - JSONObject jsonObject = jsonArray.getJSONObject(dayInt); + private void extracted(LJUserVo ljUserVos, JSONArray jsonArray, int dayInt) { + IntegralDetail integralDetail = new IntegralDetail(); + integralDetail.setStoreId(ljUserVos.getStoreId()); + + JSONObject jsonObject = new JSONObject(); + if (dayInt >= 8 ) { + jsonObject = jsonArray.getJSONObject(7); + + } else { + jsonObject = jsonArray.getJSONObject(dayInt); + } + Map map = new HashMap<>(jsonObject); String point = map.get("integral").toString(); // 获取积分 - integralDetail.setUserId(nowAccountInfo.getId()); + integralDetail.setUserId(ljUserVos.getId()); integralDetail.setPointsChange(Double.valueOf(point)); // 计算积分 @@ -279,6 +299,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { integralDetail.setCurrentPoints(addPoints.intValue()); integralDetail.setChangeType("1"); integralDetail.setType("签到赠送"); + integralDetail.setChainStoreId(ljUserVos.getChainStoreId()); integralDetail.setChangeReason("签到第"+ (dayInt +1)+"天获得"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersRequest.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersRequest.java index 1486b25de..24464620d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersRequest.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersRequest.java @@ -1,6 +1,7 @@ package com.fuint.business.integral.vo; import com.fuint.business.integral.entity.IntegralOrders; +import io.swagger.models.auth.In; import lombok.Data; import java.util.List; @@ -21,6 +22,22 @@ public class IntegralOrdersRequest { */ private Double allPoints; + /** + * 连锁店id + */ + private Integer chainStoreId; + + /** + * 店铺id + */ + private Integer storeId; + + /** + * 下单渠道 + * -1为小程序 + */ + private Integer orderChannel; + /** * 用户id */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml index c8bdc1399..5e64bb4ae 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml @@ -29,12 +29,13 @@ + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java index 5c6dc5ce5..bbf2163a8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java @@ -42,6 +42,7 @@ public interface CardFuelChangeService { * @return 实例对象 */ CardFuelChange insert(CardFuelChange cardFuelChange); + CardFuelChange insert2(CardFuelChange cardFuelChange); /** * 修改数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java index 4d5b7f941..2cfe3bdbd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java @@ -73,6 +73,11 @@ public class CardFuelChangeServiceImpl implements CardFuelChangeService { return cardFuelChange; } + @Override + public CardFuelChange insert2(CardFuelChange cardFuelChange) { + return cardFuelChange; + } + /** * 修改数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index f13f0f6d9..cce2d7343 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -152,9 +152,10 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String timestamp = dateFormat.format(new Date()); String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6); - String orderNo = timestamp+randomString; + String orderNo = "2345"+timestamp+randomString; cardFuelRecordDTO.setPaymentNo(orderNo); cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId()); + cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId()); cardFuelRecordMapper.insert(cardFuelRecordDTO); Double theAmountToBePaid = 0.0; @@ -191,9 +192,6 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { map.put("privateKey", merchantConfig.getPrivateKey()); map.put("type", "CFR"); map.put("orderId", cardFuelRecordDTO.getId().toString()); - - - // 调用支付接口 try { fyPayService.pay(map); @@ -209,7 +207,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { CardFuelRecord cardFuelRecord = cardFuelRecordMapper.queryById(id); if ("paid".equals(cardFuelRecord.getPayStatus())){ // 查询用户信息 - LJUserVo ljUserVos = ljUserMapper.selectAllInfoById(cardFuelRecord.getMtUserId()); + LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(cardFuelRecord.getMtUserId(),cardFuelRecord.getChainStoreId()); // 修改该用户的余额信息 if (!ObjectUtil.isEmpty(ljUserVos)) { @@ -225,7 +223,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { // 积分表变动 if (!ObjectUtil.isEmpty(cardFuelRecord.getPoints()) && cardFuelRecord.getPoints() != 0) { IntegralDetail integralDetail = changesInPoints(cardFuelRecord,ljUserVos); - integralDetailService.insert(integralDetail); + integralDetailService.insert2(integralDetail); } }else { return cardFuelRecord; @@ -286,6 +284,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { public CardFuelChange editFuelChange (CardFuelRecord cardFuelRecord) { CardFuelChange cardFuelChange = new CardFuelChange(); cardFuelChange.setChainStoreId(cardFuelRecord.getChainStoreId()); + cardFuelChange.setStoreId(cardFuelRecord.getStoreId()); cardFuelChange.setUserId(cardFuelRecord.getMtUserId()); cardFuelChange.setChangeType("1"); cardFuelChange.setFromType("油卡充值赠送"); @@ -306,6 +305,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { integralDetail.setCurrentPoints(addPoints.intValue()); integralDetail.setChangeReason("购买油卡赠送"); + integralDetail.setStoreId(cardFuelRecord.getStoreId()); + integralDetail.setChainStoreId(cardFuelRecord.getChainStoreId()); return integralDetail; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 32daa9b07..4535786f6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardValue.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -20,6 +21,7 @@ import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordSer import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel; import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.service.CardBalanceChangeService; +import com.fuint.business.record.entity.RocketmqRecord; import com.fuint.business.userManager.entity.LJUser; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.mapper.LJUserMapper; @@ -27,12 +29,24 @@ import com.fuint.business.userManager.service.LJUserService; import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.business.userManager.vo.LJUserVo; import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.DistributedLockUtil; +import com.fuint.common.util.RedisLock; +import com.fuint.common.util.RocketUtil; import com.fuint.common.util.TokenUtil; import io.lettuce.core.dynamic.annotation.Param; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.spring.core.RocketMQTemplate; +import org.apache.rocketmq.spring.support.RocketMQHeaders; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -73,6 +87,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl= 0.0) { BigDecimal bigDecimal = new BigDecimal(cardValueRecordDTO.getBidBalance()); - bigDecimal = bigDecimal.add(new BigDecimal(cardValueRecordDTO.getGiftBalance()).add(new BigDecimal(cardValueRecordDTO.getRechargeBalance()))); + bigDecimal = bigDecimal.add(new BigDecimal(cardValueRecordDTO.getGiftBalance()).add(new BigDecimal(cardValueRecordDTO.getRechargeBalance().toString()))); cardValueRecordDTO.setBidBalance(bigDecimal.doubleValue()); } baseMapper.insert(cardValueRecordDTO); @@ -205,6 +228,22 @@ public class CardValueRecordServiceImpl extends ServiceImpl msg = new HashMap<>(); + msg.put("tag","cardTag"); + msg.put("ordId",cardValueRecordDTO.getId().toString()); + msg.put("ordNo",orderNo); + msg.put("storeId",nowAccountInfo.getStoreId()); + msg.put("chainStoreId",nowAccountInfo.getChainStoreId()); + + // 发起rocket请求 + rocketUtil.pushMessage(msg); + + + + + // 支付 payment_type return cardValueRecordDTO; } @@ -222,7 +261,7 @@ public class CardValueRecordServiceImpl extends ServiceImplepsilon) { cardBalanceChange.setFromType("余额充值赠送"); cardBalanceChange.setBalance(cardValueRecord.getGiftBalance()); - cardBalanceChangeService.insertCardBalance(cardBalanceChange); + cardBalanceChange.setStoreId(cardValueRecord.getStoreId()); + cardBalanceChange.setChainStoreId(cardValueRecord.getChainStoreId()); + cardBalanceChange.setCreateBy(cardValueRecord.getMtStaffId().toString()); + cardBalanceChangeService.insertCardBalance2(cardBalanceChange); } // 积分表变动 if (!ObjectUtil.isEmpty(cardValueRecord.getPoints()) && cardValueRecord.getPoints() != 0) { IntegralDetail integralDetail = changesInPoints(cardValueRecord,ljUserVos); - integralDetailService.insert(integralDetail); + integralDetail.setStoreId(cardValueRecord.getStoreId()); + integralDetail.setChainStoreId(cardValueRecord.getChainStoreId()); + integralDetail.setCreateBy(cardValueRecord.getMtStaffId().toString()); + integralDetailService.insert2(integralDetail); } // 成长值变动明细 // 员工提成 if (!ObjectUtil.isEmpty(cardValueRecord.getRoyaltyType()) && !"1".equals(cardValueRecord.getRoyaltyType())) { CommissionRecord commissionRecord = employeeCommissions(cardValueRecord); - commissionRecordService.insert(commissionRecord); + commissionRecordService.insert2(commissionRecord); } } else { @@ -263,15 +308,15 @@ public class CardValueRecordServiceImpl extends ServiceImpl +order by cbc.create_time DESC \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java index 0b1a0718e..5e60fb89c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java @@ -15,6 +15,8 @@ public interface CardBalanceChangeService extends IService { */ public int insertCardBalance(CardBalanceChange cardBalanceChange); + public int insertCardBalance2(CardBalanceChange cardBalanceChange); + IPage getCardRecordList(Page page, CardBalanceChange cardBalanceChange); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java index 34a16e5b5..593f285a2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java @@ -23,6 +23,12 @@ public class CardBalanceChangeServiceImpl extends ServiceImpl getCardRecordList(Page page, CardBalanceChange cardBalanceChange) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/controller/RocketmqRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/controller/RocketmqRecordController.java index e69de29bb..13c49c5bd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/controller/RocketmqRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/controller/RocketmqRecordController.java @@ -0,0 +1,93 @@ +package com.fuint.business.record.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.record.entity.RocketmqRecord; +import com.fuint.business.record.service.RocketmqRecordService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; +import io.lettuce.core.dynamic.annotation.Param; + + +import javax.annotation.Resource; + +/** + * (RocketmqRecord)表控制层 + * + * @author wangh + * @since 2023-12-14 10:50:02 + */ +@RestController +@RequestMapping("rocketmqRecord") +public class RocketmqRecordController extends BaseController { + /** + * 服务对象 + */ + @Resource + private RocketmqRecordService rocketmqRecordService; + + /** + * 分页查询 + * + * @param rocketmqRecord 筛选条件 + * @param pageNo 分页对象 + * @return 查询结果 + */ + @GetMapping("queryByPage") + public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + @Param("rocketmqRecord") RocketmqRecord rocketmqRecord) { + Page page = new Page(pageNo, pageSize); + IPage< RocketmqRecord> iPageList = this.rocketmqRecordService.queryByPage(page, rocketmqRecord); + return getSuccessResult(iPageList); + } + + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject queryById(@PathVariable("id") Integer id) { + return getSuccessResult(this.rocketmqRecordService.queryById(id)); + } + + /** + * 新增数据 + * + * @param rocketmqRecord 实体 + * @return 新增结果 + */ + @PostMapping + public ResponseObject add(@RequestBody RocketmqRecord rocketmqRecord) { + return getSuccessResult(this.rocketmqRecordService.insert(rocketmqRecord)); + } + + /** + * 编辑数据 + * + * @param rocketmqRecord 实体 + * @return 编辑结果 + */ + @PutMapping + public ResponseObject edit(@RequestBody RocketmqRecord rocketmqRecord) { + return getSuccessResult(this.rocketmqRecordService.update(rocketmqRecord)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping + public ResponseObject deleteById(Integer id) { + return getSuccessResult(this.rocketmqRecordService.deleteById(id)); + } + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/entity/RocketmqRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/entity/RocketmqRecord.java index e69de29bb..ab52774ea 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/entity/RocketmqRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/entity/RocketmqRecord.java @@ -0,0 +1,71 @@ +package com.fuint.business.record.entity; + +import java.util.Date; +import com.fuint.repository.model.base.BaseEntity; +import lombok.Data; + +/** + * (RocketmqRecord)实体类 + * + * @author wangh + * @since 2023-12-14 10:50:02 + */ +@Data +public class RocketmqRecord extends BaseEntity { + private static final long serialVersionUID = 126513856778862761L; + + private Integer id; + /** + * RocketMQ 消息的唯一标识 + */ + private String messageId; + /** + * 订单类型 + */ + private String orderType; + + /** + * 发送的主题 + */ + private String topic; + /** + * 订单ID + */ + private Integer orderId; + /** + * 处理状态 + */ + private String processStatus; + /** + * 处理次数 + */ + private Integer processCount; + /** + * 发送状态 + */ + private String sendStatus; + /** + * 所属连锁店id + */ + private Integer chainStoreId; + /** + * 店铺id + */ + private Integer storeId; + + + + + + + + + + + + + + + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/RocketmqRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/RocketmqRecordMapper.java index e69de29bb..7fbc24708 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/RocketmqRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/RocketmqRecordMapper.java @@ -0,0 +1,85 @@ +package com.fuint.business.record.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.record.entity.RocketmqRecord; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; +import java.util.List; + +/** + * (RocketmqRecord)表数据库访问层 + * + * @author wangh + * @since 2023-12-14 10:50:02 + */ +public interface RocketmqRecordMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + RocketmqRecord queryById(Integer id); + + /** + * 查询指定行数据 + * + * @param rocketmqRecord 查询条件 + * @param page 分页对象 + * @return 对象列表 + */ + IPage queryAllByLimit(@Param("page") Page page, RocketmqRecord rocketmqRecord); + + /** + * 统计总行数 + * + * @param rocketmqRecord 查询条件 + * @return 总行数 + */ + long count(RocketmqRecord rocketmqRecord); + + /** + * 新增数据 + * + * @param rocketmqRecord 实例对象 + * @return 影响行数 + */ + int insert(RocketmqRecord rocketmqRecord); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 批量新增或按主键更新数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 + */ + int insertOrUpdateBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param rocketmqRecord 实例对象 + * @return 影响行数 + */ + int update(RocketmqRecord rocketmqRecord); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/xml/RocketmqRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/xml/RocketmqRecordMapper.xml index e69de29bb..ab08bc927 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/xml/RocketmqRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/mapper/xml/RocketmqRecordMapper.xml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into rocketmq_record(message_id, order_type, order_id, process_status, process_count, send_status, create_by, create_time, update_by, update_time, chain_store_id, store_id) + values (#{messageId}, #{orderType}, #{orderId}, #{processStatus}, #{processCount}, #{sendStatus}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{chainStoreId}, #{storeId}) + + + + insert into rocketmq_record(message_id, order_type, order_id, process_status, process_count, send_status, create_by, create_time, update_by, update_time, chain_store_id, store_id) + values + + (#{entity.messageId}, #{entity.orderType}, #{entity.orderId}, #{entity.processStatus}, #{entity.processCount}, #{entity.sendStatus}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.chainStoreId}, #{entity.storeId}) + + + + + insert into rocketmq_record(message_id, order_type, order_id, process_status, process_count, send_status, create_by, create_time, update_by, update_time, chain_store_id, store_id) + values + + (#{entity.messageId}, #{entity.orderType}, #{entity.orderId}, #{entity.processStatus}, #{entity.processCount}, #{entity.sendStatus}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.chainStoreId}, #{entity.storeId}) + + on duplicate key update + message_id = values(message_id), + order_type = values(order_type), + order_id = values(order_id), + process_status = values(process_status), + process_count = values(process_count), + send_status = values(send_status), + create_by = values(create_by), + create_time = values(create_time), + update_by = values(update_by), + update_time = values(update_time), + chain_store_id = values(chain_store_id), + store_id = values(store_id) + + + + + update rocketmq_record + + + message_id = #{messageId}, + + + order_type = #{orderType}, + + + order_id = #{orderId}, + + + process_status = #{processStatus}, + + + process_count = #{processCount}, + + + send_status = #{sendStatus}, + + + create_by = #{createBy}, + + + create_time = #{createTime}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + chain_store_id = #{chainStoreId}, + + + store_id = #{storeId}, + + + where id = #{id} + + + + + delete from rocketmq_record where id = #{id} + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/RocketmqRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/RocketmqRecordService.java index e69de29bb..a5a3c658f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/RocketmqRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/RocketmqRecordService.java @@ -0,0 +1,58 @@ +package com.fuint.business.record.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.record.entity.RocketmqRecord; +import io.lettuce.core.dynamic.annotation.Param; + + +/** + * (RocketmqRecord)表服务接口 + * + * @author wangh + * @since 2023-12-14 10:50:03 + */ +public interface RocketmqRecordService { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + RocketmqRecord queryById(Integer id); + + /** + * 分页查询 + * + * @param rocketmqRecord 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + IPage queryByPage(@Param("page") Page page, RocketmqRecord rocketmqRecord); + + /** + * 新增数据 + * + * @param rocketmqRecord 实例对象 + * @return 实例对象 + */ + RocketmqRecord insert(RocketmqRecord rocketmqRecord); + + /** + * 修改数据 + * + * @param rocketmqRecord 实例对象 + * @return 实例对象 + */ + RocketmqRecord update(RocketmqRecord rocketmqRecord); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean deleteById(Integer id); + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/impl/RocketmqRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/impl/RocketmqRecordServiceImpl.java index e69de29bb..c1aa1c2f6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/impl/RocketmqRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/record/service/impl/RocketmqRecordServiceImpl.java @@ -0,0 +1,89 @@ +package com.fuint.business.record.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.record.entity.RocketmqRecord; +import com.fuint.business.record.mapper.RocketmqRecordMapper; +import com.fuint.business.record.service.RocketmqRecordService; +import org.springframework.stereotype.Service; +import com.fuint.common.util.TokenUtil; +import io.lettuce.core.dynamic.annotation.Param; +import com.fuint.common.dto.AccountInfo; + + + +import javax.annotation.Resource; + +/** + * (RocketmqRecord)表服务实现类 + * + * @author wangh + * @since 2023-12-14 10:50:03 + */ +@Service("rocketmqRecordService") +public class RocketmqRecordServiceImpl implements RocketmqRecordService { + @Resource + private RocketmqRecordMapper rocketmqRecordMapper; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public RocketmqRecord queryById(Integer id) { + return this.rocketmqRecordMapper.queryById(id); + } + + /** + * 分页查询 + * + * @param rocketmqRecord 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + @Override + public IPage queryByPage(@Param("page") Page page, RocketmqRecord rocketmqRecord) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + rocketmqRecord.setStoreId(nowAccountInfo.getStoreId()); + return this.rocketmqRecordMapper.queryAllByLimit(page, rocketmqRecord); + } + + /** + * 新增数据 + * + * @param rocketmqRecord 实例对象 + * @return 实例对象 + */ + @Override + public RocketmqRecord insert(RocketmqRecord rocketmqRecord) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + rocketmqRecord.setStoreId(nowAccountInfo.getStoreId()); + this.rocketmqRecordMapper.insert(rocketmqRecord); + return rocketmqRecord; + } + + /** + * 修改数据 + * + * @param rocketmqRecord 实例对象 + * @return 实例对象 + */ + @Override + public RocketmqRecord update(RocketmqRecord rocketmqRecord) { + this.rocketmqRecordMapper.update(rocketmqRecord); + return this.queryById(rocketmqRecord.getId()); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Integer id) { + return this.rocketmqRecordMapper.deleteById(id) > 0; + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java index daf5dccc1..f27000d1d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java @@ -67,6 +67,8 @@ public interface LJUserMapper extends BaseMapper { LJUserVo selectAllInfoById(@Param("userId") Integer userId); + LJUserVo selectAllInfoById2(@Param("userId") Integer userId,@Param("chainStoreId") Integer chainStoreId); + LJUserVo selectAllInfoById4Chain(@Param("userId") Integer userId, @Param("chainStoreId") Integer chainStoreId); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index 4e19affe8..fe9ded036 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -83,6 +83,19 @@ limit 1 + +