From 95044dd4dacee5f7ecb081af5d557d14fad83c24 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 22 八月 2023 18:39:47 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index d1cce04..d9ee052 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1294,9 +1294,15 @@
@Override
public MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
Long shopId = merHomeShopTotalVo.getShopId();
+ //获取今日到店
Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
+ //获取待处理订单和营业额
merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
+ //获取服务统计
+ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId);
merHomeShopTotalVo.setTodayShop(todayShop);
+ merHomeShopTotalVo.setCycleSurp(serviceTotalVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(serviceTotalVo.getExplorationSurp());
return merHomeShopTotalVo;
}
@@ -1623,20 +1629,21 @@
// 调用remoteMemberService的getMember方法获取Member对象
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
- throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
- if(memberCoupon.getShopId().equals(shopId)){
+ if(!memberCoupon.getShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
//如果是平台优惠券，当用户绑定商户时验证商户一致
if (memberCoupon.getCouponFrom() == 1 && member.getBindingFlag() == 1) {
- if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
+ /*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
- }
- if(memberCoupon.getShopId().equals(shopId)){
+ }*/
+ //判断绑定商户是否和核销商户一致
+ if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
@@ -2201,14 +2208,14 @@
remoteMemberService.updateMemberBinding(appMemberBindingDto);
}
//更新商户统计
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setOrderType(1);
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
//创建支付记录
PayRecord payRecord = new PayRecord();
payRecord.setDelFlag(0);
@@ -3259,20 +3266,21 @@
Long userId = verifyCouponGetVo.getUserId();
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
- throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
- if(memberCoupon.getShopId().equals(shopId)){
+ if(!memberCoupon.getShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
//如果是平台优惠券，当用户绑定商户时验证商户一致
if (memberCoupon.getCouponFrom() == 1 && member.getBindingFlag() == 1) {
- if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
+ /*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
- }
- if(memberCoupon.getShopId().equals(shopId)){
+ }*/
+ //判断绑定商户是否和核销商户一致
+ if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
@@ -3428,7 +3436,9 @@
merTotalDto.setShopIdList(shopIdList);
merTotalDto.setShopId(null);
}
+ //线上线下活动订单
MerOrderTotalVo orderTotalVo = orderMapper.getMerOrderTotalOrderFrom(merTotalDto);
+ //分类型订单
MerOrderTotalVo goodsTypeVo = orderMapper.getMerTotalOrderTotalGoodsType(merTotalDto);
orderTotalVo.setCycleTotal(goodsTypeVo.getCycleTotal());
orderTotalVo.setCycleMoney(goodsTypeVo.getCycleMoney());
@@ -3835,14 +3845,14 @@
//更新商品统计
remoteGoodsService.changeGoodsTotal(goodsTotalChangeDtoList);
// 更新商户统计信息
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setOrderType(1);
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
// 初始化会员统计信息
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
memberTotalChangeDto.setUserId(order.getUserId());
@@ -4011,14 +4021,14 @@
}
}
// 更新商户统计信息
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setOrderType(2);
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
// 初始化会员统计信息
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
memberTotalChangeDto.setUserId(order.getUserId());
@@ -4522,10 +4532,6 @@
orderFromDesc = "商城订单";
}
merOrderPageVo.setOrderFromDesc(orderFromDesc);
- merOrderPageVo.setUnPaidMoney(merOrderPageVo.getPayMoney().subtract(merOrderPageVo.getReceiveMoney()));
- if (merOrderPageVo.getUnPaidMoney() == null) {
- merOrderPageVo.setUnPaidMoney(zeroBig);
- }
if(merOrderPageVo.getUnPaidMoney().compareTo(zeroBig)<0){
merOrderPageVo.setUnPaidMoney(zeroBig);
}
--
Gitblit v1.7.1