dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:aa3289abc618082f490287bdbc990bc0b95d4b0d
Branches Tags
dianliang:master
..
compare: dianliang:fbb22469dedc1391a84968def544713abb655706
Branches Tags
dianliang:master

No commits in common. "aa3289abc618082f490287bdbc990bc0b95d4b0d" and "fbb22469dedc1391a84968def544713abb655706" have entirely different histories.
aa3289abc6 ... fbb22469de

1 changed files with 10 additions and 12 deletions
Show Stats Expand all files Collapse all files

22
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java
View File

@ -68,19 +68,17 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
LambdaQueryWrapper<MemberOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MemberOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag, 0).eq(MemberOrder::getOrderNo, orderNo); lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag, 0).eq(MemberOrder::getOrderNo, orderNo);
MemberOrder memberOrder = getOne(lambdaQueryWrapper); MemberOrder memberOrder = getOne(lambdaQueryWrapper);
if(memberOrder.getIsPay() != 1) { /*2、处理不同类型订单*/
/*2、处理不同类型订单*/ if ("01".equals(memberOrder.getOrderType())) {
if ("01".equals(memberOrder.getOrderType())) { cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId());
cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId()); } else {
} else { couponService.dealMemberCoupon(memberOrder);
couponService.dealMemberCoupon(memberOrder);
}
/*3、处理订单表数据*/
memberOrder.setPayTime(new Date());
memberOrder.setIsPay(1);
memberOrder.setPayWay("02");
updateById(memberOrder);
} }
/*3、处理订单表数据*/
memberOrder.setPayTime(new Date());
memberOrder.setIsPay(1);
memberOrder.setPayWay("02");
updateById(memberOrder);
} }
/** /**