From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 406 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 255 insertions(+), 151 deletions(-)
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 35d4d3e..9ed66d0 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
@@ -6,13 +6,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.feignClient.BalanceChangeRecordClient;
-import com.ruoyi.account.api.feignClient.UserPointClient;
+import com.ruoyi.account.api.feignClient.*;
import com.ruoyi.account.api.model.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.QRCodeGenerator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
@@ -22,14 +21,13 @@
import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.model.RefundPass;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderBalancePaymentService;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.RefundPassService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.util.ExpressDeliveryUtil;
import com.ruoyi.order.util.payment.PaymentUtil;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.payment.model.RefundResult;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
+import com.ruoyi.order.util.vo.QueryKD100ListVo;
import com.ruoyi.order.util.vo.QueryKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
@@ -37,13 +35,16 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
+import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -85,9 +86,6 @@
private UserPointClient userPointClient;
@Resource
- private PointSettingClient pointSettingClient;
-
- @Resource
private OrderBalancePaymentService orderBalancePaymentService;
@Resource
@@ -98,6 +96,22 @@
@Resource
private RefundPassService refundPassService;
+ @Resource
+ private TechnicianSubscribeClient technicianSubscribeClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
+
+ @Resource
+ private UserCouponClient userCouponClient;
+
+ @Resource
+ private UserChangeLogClient userChangeLogClient;
@@ -135,16 +149,16 @@
orderGoodsVO.setGoodsName(goods.getName());
orderGoodsVO.setType(goods.getType());
orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
- orderGoodsVO.setSellingPrice(goods.getSellingPrice());
+ orderGoodsVO.setSellingPrice(orderGood.getSellingPrice());
+ orderGoodsVO.setIntegral(orderGood.getIntegral());
orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
goodsList.add(orderGoodsVO);
}
// 收货地址
String addressJson = order.getAddressJson();
UserAddress userAddress = new UserAddress();
- if (StringUtils.isNotEmpty(addressJson)){
+ if (2 == order.getDistributionMode()){
userAddress = JSONObject.parseObject(addressJson, UserAddress.class);
-
}
// 优惠券
String couponJson = order.getCouponJson();
@@ -160,21 +174,7 @@
orderActivityInfo = JSONObject.parseObject(activityJson, OrderActivityInfo.class);
}
OrderDetailVO orderDetailVO = new OrderDetailVO();
-
- if (CollectionUtil.isNotEmpty(orderGoods)){
- String goodJson = orderGoods.get(0).getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
- orderDetailVO.setDistributionMode(goods.getDistributionMode());
- }
-
- Technician technician = new Technician();
- if (order.getTechnicianId() != null){
- R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
- if (shopdetail.getCode() != R.SUCCESS){
- throw new ServiceException("获取技师信息失败");
- }
- technician = shopdetail.getData();
- }
+ orderDetailVO.setDistributionMode(order.getDistributionMode());
Shop shop = shopR.getData();
orderDetailVO.setId(order.getId());
orderDetailVO.setOrderStatus(order.getOrderStatus());
@@ -182,6 +182,7 @@
orderDetailVO.setAddressId(userAddress.getId());
orderDetailVO.setRecieveName(userAddress.getRecieveName());
orderDetailVO.setRecievePhone(userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderDetailVO.setRecieveAddress(userAddress.getRecieveAddress());
orderDetailVO.setOrderNumber(order.getOrderNumber());
orderDetailVO.setCreateTime(order.getCreateTime());
@@ -198,7 +199,30 @@
orderDetailVO.setLongitude(shop.getLongitude());
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
- orderDetailVO.setTechnicianName(technician.getName());
+ if(StringUtils.isNotEmpty(order.getExpressResult())){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
+ List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
+ orderDetailVO.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
+ }
+
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(data.size() > 0){
+ Long id = data.get(0).getId();
+ orderDetailVO.setTechnicianSubscribeId(id.toString());
+ Technician technician = technicianClient.shopdetail(order.getTechnicianId()).getData();
+ orderDetailVO.setTechnicianName(technician.getName());
+ orderDetailVO.setTechnicianId(technician.getId());
+ }
+ }
+ // 生成核销码BASE64
+ try {
+ String base64 = QRCodeGenerator.generateQRCodeBase64(String.valueOf(order.getId()), 124, 124);
+ orderDetailVO.setWriteOffCode(base64);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServiceException("生成核销码失败");
+ }
return orderDetailVO;
}
@@ -231,13 +255,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String code,Integer shopId) {
+ public void writeOff(String id, Integer shopId, String technicianId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getId, code));
+ Order order = orderMapper.selectById(id);
boolean check = check(order, shopId, loginUserApplet.getUserid());
if (!check){
- throw new ServiceException("订单不存在");
+ throw new ServiceException("该订单与当前扫码门店不一致");
}
// 售后设置
@@ -256,6 +279,10 @@
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
+ order.setCancellerAppUserId(loginUserApplet.getUserid());
+ if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
+ order.setTechnicianId(Integer.valueOf(technicianId));
+ }
orderMapper.updateById(order);
}
@@ -303,10 +330,17 @@
for (OrderPageListVo orderPageListVo : list) {
Long appUserId = orderPageListVo.getAppUserId();
AppUser appUser = appUserClient.getAppUserById(appUserId);
- orderPageListVo.setUserName(appUser.getName());
- orderPageListVo.setPhone(appUser.getPhone());
- RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
+ if(null != appUser){
+ orderPageListVo.setUserName(appUser.getName());
+ orderPageListVo.setPhone(appUser.getPhone());
+ }
+ RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
+
+ // 平台分佣
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), Long.valueOf(orderPageListVo.getId())).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderPageListVo.setGetCommission(reduce);
}
return pageInfo.setRecords(list);
}
@@ -330,7 +364,7 @@
if(!Arrays.asList(1, 2, 3).contains(order.getOrderStatus())){
return R.fail("订单取消失败");
}
- if(LocalDateTime.now().isAfter(order.getAfterSaleTime())){
+ if(null != order.getAfterSaleTime() && LocalDateTime.now().isAfter(order.getAfterSaleTime())){
return R.fail("订单取消失败");
}
order.setOrderStatus(5);
@@ -343,13 +377,11 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
@Override
- public R confirmDelivery(Long orderId, String code) {
- Order order = this.getById(orderId);
+ public R confirmDelivery(ConfirmDelivery confirmDelivery) {
+ Order order = this.getById(confirmDelivery.getOrderId());
if(1 == order.getPayStatus()){
return R.fail("订单还未完成支付");
}
@@ -360,8 +392,28 @@
return R.fail("无效的操作");
}
//添加快递号和修改订单状态
- order.setExpressJson(code);
+ order.setExpressJson(confirmDelivery.getCode());
+ order.setDeliverProvince(confirmDelivery.getDeliverProvince());
+ order.setDeliverProvinceCode(confirmDelivery.getDeliverProvinceCode());
+ order.setDeliverCity(confirmDelivery.getDeliverCity());
+ order.setDeliverCityCode(confirmDelivery.getDeliverCityCode());
+ order.setDeliverDistrict(confirmDelivery.getDeliverDistrict());
+ order.setDeliverDistrictCode(confirmDelivery.getDeliverDistrictCode());
order.setOrderStatus(2);
+ //添加查询快递信息队列
+ //一小时后定时查询快递信息
+ SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Integer waitTime = jsonObject.getInteger("waitTime");
+ redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+
+ JSONObject jsonObject1 = JSON.parseObject(confirmDelivery.getCode());
+ String com = jsonObject1.getString("com");
+ String num = jsonObject1.getString("num");
+ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
+ MapTrackKD100Vo mapTrackKD100Vo = ExpressDeliveryUtil.kd100MapTrack(com, num, order.getDeliverProvince() + order.getDeliverCity(),
+ userAddress.getProvince() + userAddress.getCity());
+ order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
this.updateById(order);
return R.ok();
}
@@ -378,7 +430,7 @@
if(Arrays.asList(5, 6, 7).contains(order.getOrderStatus())){
return R.fail("无效的操作");
}
- if(LocalDateTime.now().isAfter(order.getAfterSaleTime())){
+ if(null != order.getAfterSaleTime() && LocalDateTime.now().isAfter(order.getAfterSaleTime())){
return R.fail("订单取消失败");
}
order.setOrderStatus(5);
@@ -420,17 +472,19 @@
appUser.setBalance(balance.add(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
appUser.setShopAmount(appUser.getShopAmount().subtract(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
//查询最后一次的消费订单
- Order order1 = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, order.getAppUserId()).eq(Order::getPayStatus, 2).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(2, 3, 4, 8)).ne(Order::getId, order.getId()).last(" order by create_time desc limit 0, 1"));
+ Order order1 = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, order.getAppUserId()).eq(Order::getPayStatus, 2)
+ .eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 8)).ne(Order::getId, order.getId()).last(" order by create_time desc limit 0, 1"));
if(null != order1){
appUser.setLastShopTime(order1.getCreateTime());
}else{
- appUser.setLastShopTime(LocalDateTime.MIN);
+ appUser.setLastShopTime(null);
}
//构建账户余额流水明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(paymentAmount);
@@ -438,6 +492,52 @@
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+
+ //退回获得的消费积分
+ //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
+ Integer lavePoint = appUser.getLavePoint();
+
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
+ }
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(shopPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
+
+ //降级检测
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUserClient.vipDemotion(appUser.getId());
+ }
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
}
if(3 == payMethod){
//开始运费退款，积分支付，运费是单独进行支付的，所以需要单独退款
@@ -457,13 +557,16 @@
//余额退款
OrderBalancePayment orderBalancePayment = orderBalancePaymentService.getOne(new LambdaQueryWrapper<OrderBalancePayment>().eq(OrderBalancePayment::getOrderId, order.getId()));
BigDecimal balance = appUser.getBalance();
- appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
- appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderBalancePayment){
+ appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ }
appUser.setBalance(balance.add(expressAmount).setScale(2, RoundingMode.HALF_EVEN));
//构建账户余额流水明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(expressAmount);
@@ -499,40 +602,8 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
}
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
@@ -555,41 +626,52 @@
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
this.updateById(order);
-
//退回获得的消费积分
//需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
}
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
//构建积分流水明细
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
+ userPoint.setVariablePoint(shopPoint);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
appUserClient.editAppUserById(appUser);
+
+ //降级检测
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUserClient.vipDemotion(appUser.getId());
+ }
+
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
return R.ok();
}
@@ -636,44 +718,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
-
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
-
- order.setRefundStatus(2);
- order.setRefundTime(LocalDateTime.now());
- return null;
+ return R.ok();
}
/**
@@ -733,9 +778,11 @@
orderInfo.setOrderStatus(order.getOrderStatus());
orderInfo.setCreateTime(order.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
- orderInfo.setUserName(appUser.getName());
- orderInfo.setPhone(appUser.getPhone());
- orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getExpressJson()) ? "单品-快递配送" : "单品-自提"));
+ if(null != appUser){
+ orderInfo.setUserName(appUser.getName());
+ orderInfo.setPhone(appUser.getPhone());
+ }
+ orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getAddressJson()) ? "单品-快递配送" : "单品-上门自提"));
Shop shop = shopClient.getShopById(order.getShopId()).getData();
if(null != shop){
orderInfo.setShopName(shop.getName());
@@ -749,18 +796,14 @@
orderInfo.setDiscountAmount(order.getDiscountTotalAmount());
orderInfo.setExpressAmount(order.getExpressAmount());
orderInfo.setPaymentAmount(order.getPaymentAmount());
- orderInfo.setPoint(order.getGetPoint());
- if(StringUtils.isNotEmpty(order.getAddressJson())){
+ orderInfo.setGetPoint(order.getGetPoint());
+ if(2 == order.getDistributionMode()){
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderInfo.setAddress(userAddress.getRecieveAddress());
- }
- if(StringUtils.isNotEmpty(order.getExpressJson())){
- JSONObject jsonObject = JSON.parseObject(order.getExpressJson());
- String com = jsonObject.getString("com");
- String num = jsonObject.getString("num");
- QueryKD100Vo queryKD100Vo = ExpressDeliveryUtil.kd100QueryTrack(com, num);
- orderInfo.setExpress(queryKD100Vo);
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
+ orderInfo.setExpress(mapTrackKD100Vo);
}
List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
@@ -775,6 +818,30 @@
goodsJson.add(map);
}
orderInfo.setGoodsJson(JSON.toJSONString(goodsJson));
+ orderInfo.setPoint(order.getPoint());
+ if(null != order.getAfterSaleTime()){
+ orderInfo.setAfterSaleTime(order.getAfterSaleTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(StringUtils.isNotEmpty(order.getActivityJson())){
+ OrderActivityInfo activityInfo = JSON.parseObject(order.getActivityJson(), OrderActivityInfo.class);
+ orderInfo.setActivityName(activityInfo.getActivityName());
+ }
+ if(null != order.getEndTime()){
+ AppUser user = appUserClient.getAppUserById(order.getCancellerAppUserId());
+ orderInfo.setCanceller(user.getName());
+ orderInfo.setWriteOffTime(order.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> technicianSubscribes = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(technicianSubscribes.size() > 0){
+ Set<Integer> collect = technicianSubscribes.stream().map(TechnicianSubscribe::getTechnicianId).collect(Collectors.toSet());
+ List<Technician> data = technicianClient.getTechnicianByIds(collect).getData();
+ orderInfo.setTechnicianName(data.stream().map(Technician::getName).collect(Collectors.joining(",")));
+ }
+ }
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), order.getId()).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderInfo.setSubcommission(reduce);
return orderInfo;
}
@@ -785,8 +852,8 @@
* @return
*/
@Override
- public Integer getGoodsSaleNum(Integer goodsId, Integer type) {
- return this.baseMapper.getGoodsSaleNum(goodsId, type);
+ public Integer getGoodsSaleNum(Integer goodsId, Integer type, Long userId) {
+ return this.baseMapper.getGoodsSaleNum(goodsId, type, userId);
}
@@ -800,4 +867,41 @@
public Integer getShopSaleNum(Integer shopId, Integer type) {
return this.baseMapper.getShopSaleNum(shopId, type);
}
+
+
+ /**
+ * 定时查询快递信息
+ */
+ @Override
+ public void taskExpress() {
+ Set<Long> order_express = redisTemplate.opsForZSet().rangeByScore("order_express", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+ if(order_express.size() > 0){
+ for (Long id : order_express) {
+ Order order = this.getById(id);
+ if(order.getOrderStatus() != 2){
+ redisTemplate.opsForZSet().remove("order_express", id);
+ continue;
+ }
+ String expressJson = order.getExpressJson();
+ if(StringUtils.isEmpty(expressJson)){
+ redisTemplate.opsForZSet().remove("order_express", id);
+ continue;
+ }
+ //{"com":"jd","num":"JDV016336234367"}
+ JSONObject jsonObject = JSON.parseObject(expressJson);
+ String com = jsonObject.getString("com");
+ String num = jsonObject.getString("num");
+ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
+ MapTrackKD100Vo mapTrackKD100Vo = ExpressDeliveryUtil.kd100MapTrack(com, num, order.getDeliverProvince() + order.getDeliverCity(),
+ userAddress.getProvince() + userAddress.getCity());
+ order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
+ this.updateById(order);
+ //延长时间x小时
+ SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+ Integer waitTime = jsonObject1.getInteger("waitTime");
+ redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+ }
+ }
+ }
}
--
Gitblit v1.7.1