From 946c4153e6a188403b1a7d05df107c6a1c91090a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 08:47:30 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 423 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 381 insertions(+), 42 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 b5793fe..4c347d4 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
@@ -4,9 +4,11 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
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.UserCouponClient;
import com.ruoyi.account.api.feignClient.UserPointClient;
import com.ruoyi.account.api.model.*;
import com.ruoyi.common.core.domain.R;
@@ -20,10 +22,13 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderBalancePaymentService;
-import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.model.RefundPass;
+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.QueryKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
@@ -31,6 +36,7 @@
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;
@@ -38,6 +44,7 @@
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;
@@ -89,6 +96,22 @@
@Resource
private GoodsClient goodsClient;
+
+ @Resource
+ private RefundPassService refundPassService;
+ @Resource
+ private TechnicianSubscribeClient technicianSubscribeClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
+
+ @Resource
+ private UserCouponClient userCouponClient;
@@ -126,7 +149,8 @@
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);
}
@@ -173,6 +197,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());
@@ -222,10 +247,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String code,Integer shopId) {
+ public void writeOff(String id,Integer shopId) {
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("订单不存在");
@@ -247,6 +271,7 @@
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
+ order.setCancellerAppUserId(loginUserApplet.getUserid());
orderMapper.updateById(order);
}
@@ -294,13 +319,46 @@
for (OrderPageListVo orderPageListVo : list) {
Long appUserId = orderPageListVo.getAppUserId();
AppUser appUser = appUserClient.getAppUserById(appUserId);
- orderPageListVo.setUserName(appUser.getName());
- orderPageListVo.setPhone(appUser.getPhone());
+ 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);
}
return pageInfo.setRecords(list);
}
-
-
+
+
+ /**
+ * 小程序取消订单
+ * @param orderId
+ * @return
+ */
+ @Override
+ public R cancel(Long orderId) {
+ Order order = this.getById(orderId);
+ if(null == order){
+ return R.fail("取消失败");
+ }
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ if(!order.getAppUserId().equals(userid)){
+ return R.fail("取消失败");
+ }
+ if(!Arrays.asList(1, 2, 3).contains(order.getOrderStatus())){
+ return R.fail("订单取消失败");
+ }
+ if(null != order.getAfterSaleTime() && LocalDateTime.now().isAfter(order.getAfterSaleTime())){
+ return R.fail("订单取消失败");
+ }
+ order.setOrderStatus(5);
+ R r = refundPayMoney(order);
+ if(200 == r.getCode()){
+ this.updateById(order);
+ }
+ return r;
+ }
+
/**
* 确认发货操作
* @param orderId
@@ -335,13 +393,18 @@
@Override
public R cancelOrder(Long orderId) {
Order order = this.getById(orderId);
- if(Arrays.asList(4, 5, 6, 7, 8).contains(order.getOrderStatus())){
+ if(Arrays.asList(5, 6, 7).contains(order.getOrderStatus())){
return R.fail("无效的操作");
}
+ if(LocalDateTime.now().isAfter(order.getAfterSaleTime())){
+ return R.fail("订单取消失败");
+ }
order.setOrderStatus(5);
- this.updateById(order);
- refundPayMoney(order);
- return R.ok();
+ R r = refundPayMoney(order);
+ if(200 == r.getCode()){
+ this.updateById(order);
+ }
+ return r;
}
@@ -349,13 +412,20 @@
* 返回订单支付金额和回退积分和会员等级
* @param order
*/
- public void refundPayMoney(Order order){
+ public R refundPayMoney(Order order){
//开始退款
Integer payMethod = order.getPayMethod();
BigDecimal paymentAmount = order.getPaymentAmount();
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
if(1 == payMethod){
//微信退款
+ RefundResult refund = PaymentUtil.refund(order.getOrderNumber(), "R" + order.getOrderNumber(), paymentAmount.doubleValue(), "/order/order/refundPayMoneyCallback");
+ if("100".equals(refund.getRa_Status())){
+ order.setRefundStatus(1);
+ return R.ok();
+ }else{
+ return R.fail(refund.getRc_CodeMsg());
+ }
}
if(2 == payMethod){
//余额退款
@@ -367,11 +437,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"));
+ if(null != order1){
+ appUser.setLastShopTime(order1.getCreateTime());
+ }else{
+ appUser.setLastShopTime(LocalDateTime.MIN);
+ }
//构建账户余额流水明细
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);
@@ -379,29 +457,80 @@
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);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUser.setVipId(appUser.getVipId() - 1);
+ }
+
+ //构建积分流水明细
+ 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);
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
}
- Integer lavePoint = appUser.getLavePoint();
if(3 == payMethod){
- //积分退款
- appUser.setLavePoint(appUser.getLavePoint() + order.getPoint());
-
//开始运费退款，积分支付，运费是单独进行支付的，所以需要单独退款
if(null != order.getExpressAmount() && BigDecimal.ZERO.compareTo(order.getExpressAmount()) < 0){
BigDecimal expressAmount = order.getExpressAmount();
if(1 == order.getExpressPayMethod()){
//微信退款
+ RefundResult refund = PaymentUtil.refund(order.getOrderNumber(), "R" + order.getOrderNumber(), expressAmount.doubleValue(), "/order/order/refundExpressPayMoneyCallback");
+ if("100".equals(refund.getRa_Status())){
+ order.setRefundStatus(1);
+ return R.ok();
+ }else{
+ return R.fail(refund.getRc_CodeMsg());
+ }
}
if(2 == order.getExpressPayMethod()){
//余额退款
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);
@@ -411,38 +540,149 @@
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
}
}
+
+ Integer lavePoint = appUser.getLavePoint();
+ //积分退款
+ appUser.setLavePoint(appUser.getLavePoint() + order.getPoint());
+ appUser.setAvailablePoint(appUser.getAvailablePoint() + order.getPoint());
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(11);
+ userPoint1.setObjectId(order.getId());
+ List<UserPoint> data = userPointClient.getUserPointList(userPoint1).getData();
+ Integer transferablePoint = order.getPoint();
+ if(data.size() > 0){
+ UserPoint userPoint = data.get(0);
+ transferablePoint = Integer.valueOf(userPoint.getExtention());
+ }
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
+
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(order.getPoint());
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
}
+
+ order.setRefundStatus(2);
+ order.setRefundTime(LocalDateTime.now());
+ return R.ok();
+ }
+
+
+ /**
+ * 取消订单后回调处理
+ * @return
+ */
+ @Override
+ public R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult) {
+ String code = refundCallbackResult.getR3_RefundOrderNo().substring(1);
+ Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, code));
+ if(null == order || order.getPayStatus() == 1 || order.getOrderStatus() == 6){
+ return R.ok();
+ }
+ order.setRefundCode(refundCallbackResult.getR5_RefundTrxNo());
+ order.setRefundStatus(2);
+ order.setRefundTime(LocalDateTime.now());
+ this.updateById(order);
//退回获得的消费积分
//需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- 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 = getPoint;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+ 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.setLavePoint(lavePoint - getPoint);
- appUser.setShopPoint(appUser.getShopPoint() - earnPoint1);
- appUser.setTotalPoint(appUser.getTotalPoint() - earnPoint1);
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
if(vipDemotion){
appUser.setVipId(appUser.getVipId() - 1);
}
+
//构建积分流水明细
UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
+ userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- Integer point = appUser.getLavePoint() - lavePoint;
- userPoint.setVariablePoint(point >= 0 ? point : point * -1);
+ 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);
+
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
+ return R.ok();
}
-
-
-
+
+
+ /**
+ * 取消订单快递费回退
+ * @return
+ */
+ @Override
+ public R refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult) {
+ String code = refundCallbackResult.getR3_RefundOrderNo().substring(1);
+ Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, code));
+ if(null == order || order.getPayStatus() == 1 || order.getOrderStatus() == 6){
+ return R.ok();
+ }
+ order.setRefundCode(refundCallbackResult.getR5_RefundTrxNo());
+ order.setRefundStatus(2);
+ order.setRefundTime(LocalDateTime.now());
+ this.updateById(order);
+
+ AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+ Integer lavePoint = appUser.getLavePoint();
+ //积分退款
+ appUser.setLavePoint(appUser.getLavePoint() + order.getPoint());
+ appUser.setAvailablePoint(appUser.getAvailablePoint() + order.getPoint());
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(11);
+ userPoint1.setObjectId(order.getId());
+ List<UserPoint> data = userPointClient.getUserPointList(userPoint1).getData();
+ Integer transferablePoint = order.getPoint();
+ if(data.size() > 0){
+ UserPoint userPoint = data.get(0);
+ transferablePoint = Integer.valueOf(userPoint.getExtention());
+ }
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
+
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(order.getPoint());
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ return R.ok();
+ }
+
/**
* 会员降级检测
*/
@@ -469,6 +709,18 @@
return R.fail("无效的操作");
}
order.setOrderStatus(4);
+ R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
+ if (R.isError(baseSettingR)) {
+ return R.fail("售后设置获取失败");
+ }
+ BaseSetting baseSetting = baseSettingR.getData();
+ if (baseSetting == null) {
+ return R.fail("售后设置获取失败");
+ }
+ String content = baseSetting.getContent();
+ JSONObject jsonObject = JSONObject.parseObject(content);
+ Long days = jsonObject.getLong("days");
+ order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
this.updateById(order);
return R.ok();
}
@@ -488,9 +740,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());
@@ -504,13 +758,14 @@
orderInfo.setDiscountAmount(order.getDiscountTotalAmount());
orderInfo.setExpressAmount(order.getExpressAmount());
orderInfo.setPaymentAmount(order.getPaymentAmount());
- orderInfo.setPoint(order.getGetPoint());
+ orderInfo.setGetPoint(order.getGetPoint());
if(StringUtils.isNotEmpty(order.getAddressJson())){
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())){
+ if(StringUtils.isNotEmpty(order.getExpressJson()) && !"NULL".equals(order.getExpressJson())){
JSONObject jsonObject = JSON.parseObject(order.getExpressJson());
String com = jsonObject.getString("com");
String num = jsonObject.getString("num");
@@ -530,6 +785,90 @@
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;
}
+
+
+ /**
+ * 获取商品销售数量
+ * @param goodsId
+ * @return
+ */
+ @Override
+ public Integer getGoodsSaleNum(Integer goodsId, Integer type) {
+ return this.baseMapper.getGoodsSaleNum(goodsId, type);
+ }
+
+
+ /**
+ * 获取店铺订单数量
+ * @param shopId
+ * @param type
+ * @return
+ */
+ @Override
+ 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