bonus
/
Bonus-Cloud-Smart-Canteen
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配置page分页

This commit is contained in:
tqzhang 2025-02-12 09:21:02 +08:00
parent 924c1b1c0b
commit f97183cfee
12 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-cust-auth/pom.xml
View File

@ -135,15 +135,15 @@
<artifactId>alipay-sdk-java</artifactId>
<version>4.34.0.ALL</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>3.5.6</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-extension</artifactId>-->
<!-- <version>3.5.6</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.10.1</version>
<version>3.5.1</version>
</dependency>
</dependencies>

2
bonus-modules/bonus-smart-canteen/pom.xml
View File

@ -19,7 +19,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.10.1</version>
<version>3.5.1</version>
</dependency>
<!--加密依赖包-->
<dependency>

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java
View File

@ -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) {

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java
View File

@ -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());
}
}

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java
View File

@ -23,5 +23,4 @@ public interface AccTradeMapper extends BaseMapper<AccTrade> {
AccRechargeSumApiVO getAccRechargeSum(@Param("param") AccRechargeSumApiDTO accRechargeSumApiDTO);
AppAccTradePageVO getOneTradeApp(@Param("tradeId") Long tradeId);
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeUseAmountHistService.java
View File

@ -23,7 +23,7 @@ public class AccTradeUseAmountHistService extends ServiceImpl<AccTradeUseAmountH
public void updateRefundAmount(Long id, BigDecimal refundAmount) {
((AccTradeUseAmountHistMapper)this.baseMapper).update(null, Wrappers.<AccTradeUseAmountHist>lambdaUpdate()
.setSql("refund_amount = refund_amount + " + String.valueOf(refundAmount), new Object[0])
.setSql("refund_amount = refund_amount + " + refundAmount)
.eq(AccTradeUseAmountHist::getId, id));
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java
View File

@ -66,9 +66,9 @@ public class AccTradeServiceImpl extends ServiceImpl<AccTradeMapper, AccTrade> i
@Override
public List<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
return ((AccTradeMapper) this.baseMapper).queryTradeAppPage(dto);
}
@Override
public Long insertAccTradeAndDetail(AccInfoVO accInfoVO, Integer tradeType, BigDecimal amount, String mchSn, List<AccWalletPayPO> walletPayList, Long orderNo, String remark, Integer payState, boolean updateWalletInfo) {
return this.insertAccTradeAndDetail(accInfoVO, tradeType, amount, mchSn, walletPayList, orderNo, remark,

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeWalletDetailServiceImpl.java
View File

@ -52,7 +52,7 @@ public class AccTradeWalletDetailServiceImpl extends ServiceImpl<AccTradeWalletD
@Override
public void updateExpiredClearTradeUseAmount(Long id, BigDecimal useAmount) {
((AccTradeWalletDetailMapper)this.baseMapper).update(null,Wrappers.<AccTradeWalletDetail>lambdaUpdate()
.setSql("use_amount = use_amount + " + String.valueOf(useAmount), new Object[0])
.setSql(true, "use_amount = use_amount + " + useAmount)
.eq(AccTradeWalletDetail::getId, id));
}

25
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java Normal file
View File

@ -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;
}
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java
View File

@ -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

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml
View File

@ -39,7 +39,6 @@
</where>
ORDER BY trade_time DESC
</select>
<!-- * 查询交易记录 场景：发送mq-->
<select id="listAccTradeForSend" resultType="com.bonus.core.account.v3.mq.send.model.RepAccMqModel">
SELECT

2
pom.xml
View File

@ -37,7 +37,7 @@
<poi.version>4.1.2</poi.version>
<transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
<jasypt-spring-boot-starter.version>3.0.2</jasypt-spring-boot-starter.version>
<mybatis-plus.version>3.5.10.1</mybatis-plus.version>
<mybatis-plus.version>3.5.1</mybatis-plus.version>
</properties>
<!-- 依赖声明 -->