czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-19 14:16:31 +08:00
parent fbd608bf17 5e7de375b4
commit 14ae8fbb10
8 changed files with 220 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
View File

@@ -25,6 +25,10 @@ public class VipPayParamDTO {
* 霸王餐使用 是否整单打包
*/
private Integer allPack;
/**
* 用户端 使用 全打包 或者 全不打包
*/
private Integer userAllPack;
@NotNull(message = "充值金额不为空")
private BigDecimal amount;

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -524,7 +524,7 @@ public class PayServiceImpl implements PayService {
//更新会员余额 并生成流水
shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
userFlowService.updateRefund(inFlow.getId(), refPayParam.getRefAmount());
if (giftFlow != null && (giftFlow.getAmount().subtract(refPayParam.getRefAmount())).compareTo(BigDecimal.ZERO) > 0) {
if (giftFlow != null && (giftFlow.getAmount().subtract(giftFlow.getRefundAmount())).compareTo(BigDecimal.ZERO) > 0) {
ShopUserMoneyEditDTO giftFlowEdit = new ShopUserMoneyEditDTO()
.setId(shopUser.getId())
.setMoney(giftFlow.getAmount())

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@@ -151,6 +151,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
}
statistic.setUpdateTime(LocalDateTime.now());
BeanUtil.copyProperties(info, statistic);
statistic.setShopId(shopId);
statistic.setCreateDay(LocalDate.now());
saveOrUpdate(statistic);
});