From a988a89e6b0cd75a5df4691eb8196c0ef9513a05 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 47 ++++++++++++-----------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 7 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 1
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsAreaController.java | 6 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 17 +++++---
5 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index e40aedf..d55f36b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -72,7 +72,7 @@
continue;
}
List<OrderGood> orderGoods = orderGoodService.list(new LambdaQueryWrapper<OrderGood>()
- .eq(OrderGood::getGoodsId, order.getId()));
+ .eq(OrderGood::getOrderId, order.getId()));
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
//直推上级分佣金额
BigDecimal ztsj_price = BigDecimal.ZERO;
@@ -308,26 +308,28 @@
//技师服务积分
if(order.getOrderType() == 1){
Technician technician = technicianClient.shopdetail(order.getTechnicianId()).getData();
- AppUser technicianAppUser = appUserClient.getAppUserById(technician.getAppUserId());
- Integer lavePoint = technicianAppUser.getLavePoint();
- if(js_point > 0){
- technicianAppUser.setLavePoint(technicianAppUser.getLavePoint() + js_point);
- technicianAppUser.setTotalPoint(technicianAppUser.getTotalPoint() + js_point);
- technicianAppUser.setTotalPerformancePoint(technicianAppUser.getTotalPerformancePoint() + js_point);
- }
- appUserClient.editAppUserById(technicianAppUser);
- //添加积分明细
- if(!technicianAppUser.getLavePoint().equals(lavePoint)){
- UserPoint userPoint = new UserPoint();
- userPoint.setType(10);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(js_point);
- userPoint.setBalance(technicianAppUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(technicianAppUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention(order.getOrderNumber());
- userPointClient.saveUserPoint(userPoint);
+ if(null != technician){
+ AppUser technicianAppUser = appUserClient.getAppUserById(technician.getAppUserId());
+ Integer lavePoint = technicianAppUser.getLavePoint();
+ if(js_point > 0){
+ technicianAppUser.setLavePoint(technicianAppUser.getLavePoint() + js_point);
+ technicianAppUser.setTotalPoint(technicianAppUser.getTotalPoint() + js_point);
+ technicianAppUser.setTotalPerformancePoint(technicianAppUser.getTotalPerformancePoint() + js_point);
+ }
+ appUserClient.editAppUserById(technicianAppUser);
+ //添加积分明细
+ if(!technicianAppUser.getLavePoint().equals(lavePoint)){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(10);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(js_point);
+ userPoint.setBalance(technicianAppUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(technicianAppUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention(order.getOrderNumber());
+ userPointClient.saveUserPoint(userPoint);
+ }
}
}
@@ -506,7 +508,8 @@
}
}
}
-
+ order.setIsCommission(1);
+ orderService.updateById(order);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index eb93bbc..18eb3c1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -246,6 +246,7 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setEndTime(LocalDateTime.now());
orderMapper.updateById(order);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index c04e268..db2b7cd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -175,6 +175,7 @@
area.setCityCode(appUser.getCityCode());
area.setProvinceCode(appUser.getProvinceCode());
area.setVip(appUser.getVipId());
+ area.setGoodsId(goodsId);
GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
if(null == goodsArea){
//没有地区价格，则使用会员价格
@@ -191,6 +192,7 @@
price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
price.setSuperiorType(goodsVip.getSuperiorType());
+ price.setSuperiorPriceType(goodsVip.getSuperiorPriceType());
price.setServuceShopCharges(goodsVip.getServuceShopCharges());
price.setServuceShopPoints(goodsVip.getServuceShopPoints());
price.setTechnicianPoints(goodsVip.getTechnicianPoints());
@@ -208,6 +210,7 @@
price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
price.setSuperiorType(goodsArea.getSuperiorType());
+ price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
price.setServuceShopCharges(goodsArea.getServuceShopCharges());
price.setServuceShopPoints(goodsArea.getServuceShopPoints());
price.setTechnicianPoints(goodsArea.getTechnicianPoints());
@@ -232,6 +235,7 @@
price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
price.setSuperiorType(goodsArea.getSuperiorType());
+ price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
price.setServuceShopCharges(goodsArea.getServuceShopCharges());
price.setServuceShopPoints(goodsArea.getServuceShopPoints());
price.setTechnicianPoints(goodsArea.getTechnicianPoints());
@@ -259,6 +263,7 @@
price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsSeckill.getSuperiorRebatePoints());
price.setSuperiorType(goodsSeckill.getSuperiorType());
+ price.setSuperiorPriceType(goodsSeckill.getSuperiorPriceType());
price.setServuceShopCharges(goodsSeckill.getServuceShopCharges());
price.setServuceShopPoints(goodsSeckill.getServuceShopPoints());
price.setTechnicianPoints(goodsSeckill.getTechnicianPoints());
@@ -516,6 +521,7 @@
vo.setSuperiorSubcommission(price.getSuperiorSubcommission());
vo.setSuperiorRebatePoints(price.getSuperiorRebatePoints());
vo.setSuperiorType(price.getSuperiorType());
+ vo.setSuperiorPriceType(price.getSuperiorPriceType());
vo.setServuceShopCharges(price.getServuceShopCharges());
vo.setServuceShopPoints(price.getServuceShopPoints());
vo.setTechnicianPoints(price.getTechnicianPoints());
@@ -846,6 +852,7 @@
orderGood.setSuperiorSubcommission(myShoppingCartVo.getSuperiorSubcommission());
orderGood.setSuperiorRebatePoints(myShoppingCartVo.getSuperiorRebatePoints());
orderGood.setSuperiorType(myShoppingCartVo.getSuperiorType());
+ orderGood.setSuperiorPriceType(myShoppingCartVo.getSuperiorPriceType());
orderGood.setServuceShopCharges(myShoppingCartVo.getServuceShopCharges());
orderGood.setServuceShopPoints(myShoppingCartVo.getServuceShopPoints());
orderGood.setTechnicianPoints(myShoppingCartVo.getTechnicianPoints());
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsAreaController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsAreaController.java
index 69c73ee..ce1f8ed 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsAreaController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsAreaController.java
@@ -31,11 +31,11 @@
*/
@PostMapping("/getGoodsArea")
public R<GoodsArea> getGoodsArea(@RequestBody GoodsArea area){
- GoodsArea one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getDistrictsCode, area.getDistrictsCode()).eq(GoodsArea::getVip, area.getVip()));
+ GoodsArea one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getGoodsId, area.getGoodsId()).eq(GoodsArea::getDistrictsCode, area.getDistrictsCode()).eq(GoodsArea::getVip, area.getVip()));
if(null == one){
- one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getCityCode, area.getCityCode()).eq(GoodsArea::getVip, area.getVip()));
+ one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getGoodsId, area.getGoodsId()).eq(GoodsArea::getCityCode, area.getCityCode()).eq(GoodsArea::getVip, area.getVip()));
if(null == one){
- one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getProvinceCode, area.getProvinceCode()).eq(GoodsArea::getVip, area.getVip()));
+ one = goodsAreaService.getOne(new LambdaQueryWrapper<GoodsArea>().eq(GoodsArea::getGoodsId, area.getGoodsId()).eq(GoodsArea::getProvinceCode, area.getProvinceCode()).eq(GoodsArea::getVip, area.getVip()));
}
}
return R.ok(one);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index a7bdf76..11aedc6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -134,14 +134,19 @@
goodsVO.setSellingPrice(sellingPrice);
goodsVO.setIntegral(integral);
- List<GoodsShop> goodsShopList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
- .eq(GoodsShop::getGoodsId, goodsId));
- if (!CollectionUtils.isEmpty(goodsShopList)){
- List<Integer> shopIds = goodsShopList.stream().map(GoodsShop::getShopId).collect(Collectors.toList());
+ if(goods.getAppointStore() == 2){
List<Shop> shopList = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
- .in(Shop::getId, shopIds));
-
+ .in(Shop::getDelFlag, 0));
goodsVO.setShopList(shopList);
+ }else{
+ List<GoodsShop> goodsShopList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
+ .eq(GoodsShop::getGoodsId, goodsId));
+ if (!CollectionUtils.isEmpty(goodsShopList)){
+ List<Integer> shopIds = goodsShopList.stream().map(GoodsShop::getShopId).collect(Collectors.toList());
+ List<Shop> shopList = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
+ .in(Shop::getId, shopIds));
+ goodsVO.setShopList(shopList);
+ }
}
return goodsVO;
}
--
Gitblit v1.7.1