diff --git a/bonus-cust-auth/pom.xml b/bonus-cust-auth/pom.xml index 2950f958..a70412d6 100644 --- a/bonus-cust-auth/pom.xml +++ b/bonus-cust-auth/pom.xml @@ -135,15 +135,15 @@ alipay-sdk-java 4.34.0.ALL - - com.baomidou - mybatis-plus-extension - 3.5.6 - + + + + + com.baomidou mybatis-plus-boot-starter - 3.5.10.1 + 3.5.1 diff --git a/bonus-modules/bonus-smart-canteen/pom.xml b/bonus-modules/bonus-smart-canteen/pom.xml index 8b993cc6..50273307 100644 --- a/bonus-modules/bonus-smart-canteen/pom.xml +++ b/bonus-modules/bonus-smart-canteen/pom.xml @@ -19,7 +19,7 @@ com.baomidou mybatis-plus-boot-starter - 3.5.10.1 + 3.5.1 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java index 60c484ba..1da09d86 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java @@ -1,6 +1,7 @@ package com.bonus.core.account.v3.app.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.core.account.v3.app.dto.AccRechargeForAppDTO; @@ -46,8 +47,6 @@ public class AppAccController extends BaseController { return null; } } - - @ApiOperation("小程序个人钱包充值") @PostMapping({"/personalRechargeForApp"}) public AjaxResult personalRecharge(@RequestBody @Valid AccRechargeForAppDTO o) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java index a9239846..b5c48eb1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bonus.common.core.exception.ServiceException; import com.bonus.constant.LeConstants; import com.bonus.core.account.v3.app.dto.AccRechargeForAppDTO; @@ -85,7 +86,6 @@ public class AppAccServiceImpl implements AppAccService { dto.setPayStateList(dto.convertPayStateList()); return this.accTradeService.queryTradeAppPage(dto); } - @Override @Transactional( rollbackFor = {Exception.class} @@ -183,4 +183,6 @@ public class AppAccServiceImpl implements AppAccService { this.accWalletService.accRechargeResultHandlerV2(AccRechargeBackDTO.convert(content.getAccTradeId(), paySelectVO)); return this.accTradeService.getOneTradeApp(content.getAccTradeId()); } + + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java index 53c86885..b4b78088 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java @@ -23,5 +23,4 @@ public interface AccTradeMapper extends BaseMapper { AccRechargeSumApiVO getAccRechargeSum(@Param("param") AccRechargeSumApiDTO accRechargeSumApiDTO); AppAccTradePageVO getOneTradeApp(@Param("tradeId") Long tradeId); - } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeUseAmountHistService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeUseAmountHistService.java index 6adce889..748d76a2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeUseAmountHistService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeUseAmountHistService.java @@ -23,7 +23,7 @@ public class AccTradeUseAmountHistService extends ServiceImpllambdaUpdate() - .setSql("refund_amount = refund_amount + " + String.valueOf(refundAmount), new Object[0]) + .setSql("refund_amount = refund_amount + " + refundAmount) .eq(AccTradeUseAmountHist::getId, id)); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java index b5005ad3..fc7aa4c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java @@ -66,9 +66,9 @@ public class AccTradeServiceImpl extends ServiceImpl i @Override public List queryTradeAppPage(AppTradeDetailListDTO dto) { + return ((AccTradeMapper) this.baseMapper).queryTradeAppPage(dto); } - @Override public Long insertAccTradeAndDetail(AccInfoVO accInfoVO, Integer tradeType, BigDecimal amount, String mchSn, List walletPayList, Long orderNo, String remark, Integer payState, boolean updateWalletInfo) { return this.insertAccTradeAndDetail(accInfoVO, tradeType, amount, mchSn, walletPayList, orderNo, remark, diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeWalletDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeWalletDetailServiceImpl.java index ca7f6a91..dc288685 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeWalletDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeWalletDetailServiceImpl.java @@ -52,7 +52,7 @@ public class AccTradeWalletDetailServiceImpl extends ServiceImpllambdaUpdate() - .setSql("use_amount = use_amount + " + String.valueOf(useAmount), new Object[0]) + .setSql(true, "use_amount = use_amount + " + useAmount) .eq(AccTradeWalletDetail::getId, id)); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java new file mode 100644 index 00000000..8539912b --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java @@ -0,0 +1,25 @@ +package com.bonus.core.config.mybatisPlusConfig; + +import com.alipay.api.domain.PageInfo; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @ClassName: MybatisPlusPageConfig + * @author: tqzhang + * @Date: 2025/2/12 8:56 + * @version: 1.0 + * @description: mybatis-plus分页插件 + */ +@Configuration +public class MybatisPlusPageConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + return interceptor; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java index 265ccdfb..74268e6b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java @@ -37,7 +37,9 @@ public class OrderShoppingCartServiceImpl implements OrderShoppingCartService { @Override public void plusQuantity(Long shoppingCartId, Integer quantity) { - this.baseMapper.update(null, (Wrapper)((LambdaUpdateWrapper)Wrappers.lambdaUpdate(OrderShoppingCart.class).eq(OrderShoppingCart::getShoppingCartId, shoppingCartId)).setSql("quantity = quantity + " + quantity, new Object[0])); + this.baseMapper.update(null, Wrappers.lambdaUpdate(OrderShoppingCart.class) + .setSql(true, "quantity = quantity + " + quantity) + .eq(OrderShoppingCart::getShoppingCartId, shoppingCartId)); } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml index aa27461e..7e4a658f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml @@ -39,7 +39,6 @@ ORDER BY trade_time DESC -