zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:59841c23b45df7f28c8971f4b8b3c9b7f2867bb6
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:7cc0e41cf6b52bc848b1e79ccf0905b86393555d
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

No commits in common. "59841c23b45df7f28c8971f4b8b3c9b7f2867bb6" and "7cc0e41cf6b52bc848b1e79ccf0905b86393555d" have entirely different histories.
59841c23b4 ... 7cc0e41cf6

3 changed files with 2 additions and 10 deletions
Show Stats Expand all files Collapse all files

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.recharge; package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -30,7 +29,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class RechargeOrderDO extends TenantBaseDO { public class RechargeOrderDO extends BaseDO {
/** /**
* 订单ID * 订单ID

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.recharge; package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -23,7 +22,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class RechargeOrderInfoDO extends TenantBaseDO { public class RechargeOrderInfoDO extends BaseDO {
/** /**
* 主键 * 主键

6
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -14,8 +14,6 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.pay.properties.AliPayProperties; import cn.iocoder.yudao.framework.pay.properties.AliPayProperties;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO; import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
@ -1151,7 +1149,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
} }
@Override @Override
@TenantIgnore
@Transactional @Transactional
public InitOrderResponse memberTopUp(OrderContentRequest request, HttpServletRequest servletRequest) { public InitOrderResponse memberTopUp(OrderContentRequest request, HttpServletRequest servletRequest) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@ -1355,7 +1352,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user, PromoterDTO promoterDTO) { private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user, PromoterDTO promoterDTO) {
Long tenantId = TenantContextHolder.getTenantId();
RechargeOrderDO orderDO = new RechargeOrderDO(); RechargeOrderDO orderDO = new RechargeOrderDO();
List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos(); List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos();
orderDO.setOrderId(code); orderDO.setOrderId(code);
@ -1376,7 +1372,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
orderDO.setBeforePayPrice(sum); orderDO.setBeforePayPrice(sum);
orderDO.setPromoterId(user.getPromoterId()); orderDO.setPromoterId(user.getPromoterId());
orderDO.setDeptId(promoterDTO.getDeptId()); orderDO.setDeptId(promoterDTO.getDeptId());
orderDO.setTenantId(tenantId);
rechargeOrderMapper.insert(orderDO); rechargeOrderMapper.insert(orderDO);
List<RechargeOrderInfoDO> infoDOS = new ArrayList<>(); List<RechargeOrderInfoDO> infoDOS = new ArrayList<>();
orderInfos.forEach(info -> { orderInfos.forEach(info -> {
@ -1392,7 +1387,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
infoDO.setDeptId(promoterDTO.getDeptId()); infoDO.setDeptId(promoterDTO.getDeptId());
infoDO.setUid(user.getId()); infoDO.setUid(user.getId());
infoDO.setRechargeGearId(info.getGearId()); infoDO.setRechargeGearId(info.getGearId());
infoDO.setTenantId(tenantId);
infoDOS.add(infoDO); infoDOS.add(infoDO);
}); });
rechargeOrderInfoMapper.insertBatch(infoDOS); rechargeOrderInfoMapper.insertBatch(infoDOS);