Explorar el Código

feature: 消费管理
1.多钱包扣费

luoyb hace 1 año
padre
commit
f0fa3403ef

+ 1 - 0
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/CheckBusiness.java

@@ -467,6 +467,7 @@ public class CheckBusiness {
         Long userId = userAccountVo.getUserId();
         // 可能会在处理过程中更改实际的消费金额,因此先取出来
         BigDecimal consumeMoney = bo.getConsumeMoney();
+        //扣费的过程金额
         BigDecimal doMoney = bo.getConsumeMoney();
         // 计算后实际需要扣费的钱包,会小于或等于指定的扣费钱包数
         List<PtBagVo> doBagVos = new ArrayList<>();

+ 3 - 2
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/service/impl/PtBagServiceImpl.java

@@ -15,6 +15,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.encrypt.utils.YcEncryptUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.server.consume.domain.PtBag;
 import org.dromara.server.consume.domain.bo.PtBagBo;
 import org.dromara.server.consume.domain.vo.PtBagVo;
@@ -56,9 +57,9 @@ public class PtBagServiceImpl implements IPtBagService {
      */
     @Override
     public PtBagVo queryByUserBagCode(Long userId, String bagCode) {
-        PtBagVo vo = baseMapper.selectVoOne(Wrappers.<PtBag>lambdaQuery()
+        PtBagVo vo = TenantHelper.ignore(() -> baseMapper.selectVoOne(Wrappers.<PtBag>lambdaQuery()
             .eq(PtBag::getUserId, userId)
-            .eq(PtBag::getBagCode,bagCode),PtBagVo.class);
+            .eq(PtBag::getBagCode, bagCode), PtBagVo.class));
         if (ObjectUtil.isNull(vo)) {
             return null;
         }

+ 0 - 2
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/service/impl/XfConsumeDetailServiceImpl.java

@@ -105,9 +105,7 @@ public class XfConsumeDetailServiceImpl implements IXfConsumeDetailService {
      */
     @Override
     public Boolean insertByBo(XfConsumeDetailBo bo) {
-        log.info("[消费明细入库Bo]-[{}]", JSONUtil.toJsonStr(bo));
         XfConsumeDetail add = MapstructUtils.convert(bo, XfConsumeDetail.class);
-        log.info("[消费明细入库实体]-[{}]", JSONUtil.toJsonStr(add));
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {