From 912d2e62391b1459952375a60ba87cfa842f1c41 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 10:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 507 insertions(+), 15 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 4cb9ffe..f68a9d5 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
@@ -1,16 +1,45 @@
package com.ruoyi.order.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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.security.service.TokenService;
+import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
+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.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
-import model.Order;
+import com.ruoyi.order.util.ExpressDeliveryUtil;
+import com.ruoyi.order.util.vo.QueryKD100Vo;
+import com.ruoyi.order.vo.*;
+import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.feignClient.*;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
-import java.util.List;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -22,24 +51,487 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+ @Resource
+ private OrderMapper orderMapper;
+ @Resource
+ private OrderGoodMapper orderGoodMapper;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private TechnicianClient technicianClient;
+ @Resource
+ private ShopClient shopClient;
+ @Resource
+ private CommissionService commissionService;
+ @Resource
+ private BaseSettingClient baseSettingClient;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private BalanceChangeRecordClient balanceChangeRecordClient;
+
+ @Resource
+ private UserPointClient userPointClient;
+
+ @Resource
+ private PointSettingClient pointSettingClient;
+
+ @Resource
+ private OrderBalancePaymentService orderBalancePaymentService;
+
+ @Resource
+ private VipSettingClient vipSettingClient;
+
+ @Resource
+ private GoodsClient goodsClient;
+
+
+
@Override
- public List<OrderVO> getOrderList(Integer status) {
- // TODO 待实现
- return Collections.emptyList();
+ public List<OrderVO> selectOrderListByUserId(Integer status, Long userId) {
+ return orderMapper.selectOrderListByUserId(status, userId);
}
+
+
+
@Override
public OrderDetailVO getOrderDetail(Long orderId) {
- // TODO 待实现
- return null;
+ Order order = orderMapper.selectById(orderId);
+ if (order == null){
+ throw new ServiceException("订单不存在");
+ }
+ R<Shop> shopR = shopClient.getShopById(order.getShopId());
+ if (!R.isSuccess(shopR)){
+ throw new ServiceException("获取门店信息失败");
+ }
+
+ // 商品
+ List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
+ .eq(OrderGood::getOrderId, orderId));
+
+ List<OrderGoodsVO> goodsList = new ArrayList<>();
+ for (OrderGood orderGood : orderGoods) {
+ String goodJson = orderGood.getGoodJson();
+ Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ OrderGoodsVO orderGoodsVO = new OrderGoodsVO();
+ orderGoodsVO.setGoodsId(orderGood.getGoodsId());
+ orderGoodsVO.setNum(orderGood.getNum());
+ orderGoodsVO.setGoodsName(goods.getName());
+ orderGoodsVO.setType(goods.getType());
+ orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
+ orderGoodsVO.setSellingPrice(goods.getSellingPrice());
+ orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
+ goodsList.add(orderGoodsVO);
+ }
+
+
+
+ // 收货地址
+ String addressJson = order.getAddressJson();
+ UserAddress userAddress = new UserAddress();
+ if (StringUtils.isNotEmpty(addressJson)){
+ userAddress = JSONObject.parseObject(addressJson, UserAddress.class);
+
+ }
+
+ // 优惠券
+ String couponJson = order.getCouponJson();
+ CouponInfo couponInfo = new CouponInfo();
+ if (StringUtils.isNotEmpty(couponJson)){
+ couponInfo = JSONObject.parseObject(couponJson, CouponInfo.class);
+ }
+
+ // 参与活动
+ String activityJson = order.getActivityJson();
+ OrderActivityInfo orderActivityInfo = new OrderActivityInfo();
+ if (StringUtils.isNotEmpty(activityJson)){
+ 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();
+ }
+ Shop shop = shopR.getData();
+ orderDetailVO.setId(order.getId());
+ orderDetailVO.setOrderStatus(order.getOrderStatus());
+ orderDetailVO.setPoint(order.getPoint());
+ orderDetailVO.setAddressId(userAddress.getId());
+ orderDetailVO.setRecieveName(userAddress.getRecieveName());
+ orderDetailVO.setRecievePhone(userAddress.getRecievePhone());
+ orderDetailVO.setRecieveAddress(userAddress.getRecieveAddress());
+ orderDetailVO.setOrderNumber(order.getOrderNumber());
+ orderDetailVO.setCreateTime(order.getCreateTime());
+ orderDetailVO.setTotalAmount(order.getTotalAmount());
+ orderDetailVO.setCouponName(couponInfo.getCouponName());
+ orderDetailVO.setActivityName(orderActivityInfo.getActivityName());
+ orderDetailVO.setCouponAmount(order.getDiscountTotalAmount());
+ orderDetailVO.setExpressAmount(order.getExpressAmount());
+ orderDetailVO.setPointAmount(order.getGetPoint());
+ orderDetailVO.setPaymentAmount(order.getPaymentAmount());
+ orderDetailVO.setGoodsList(goodsList);
+ orderDetailVO.setShopName(shop.getName());
+ orderDetailVO.setShopAddress(shop.getAddress());
+ orderDetailVO.setLongitude(shop.getLongitude());
+ orderDetailVO.setLatitude(shop.getLatitude());
+ orderDetailVO.setShopId(shop.getId());
+ orderDetailVO.setTechnicianName(technician.getName());
+ return orderDetailVO;
}
@Override
- public boolean check(String orderNumber, Long shopId) {
- Order order = getOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getOrderNumber, orderNumber)
- .eq(Order::getShopId, shopId));
- return order != null;
+ public boolean check(Order order, Integer shopId, Long userId) {
+ R<List<AppUserShop>> r = appUserClient.getAppUserShop(userId);
+ if (r.getCode() != R.SUCCESS){
+ throw new ServiceException("获取用户门店信息失败");
+ }
+ List<AppUserShop> appUserShopList = r.getData();
+ if (appUserShopList == null || appUserShopList.isEmpty()){
+ return false;
+ }
+
+ // 判断用户是否拥有该门店
+ List<AppUserShop> userShopList = appUserShopList.stream()
+ .filter(appUserShop -> appUserShop.getShopId().equals(shopId))
+ .collect(Collectors.toList());
+ if (userShopList.isEmpty()){
+ return false;
+ }
+
+ // 判断订单是否属于该门店
+ if (order == null){
+ throw new ServiceException("订单不存在");
+ }
+
+ return order.getShopId().equals(shopId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void writeOff(String code,Integer shopId) {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
+ .eq(Order::getId, code));
+ boolean check = check(order, shopId, loginUserApplet.getUserid());
+ if (!check){
+ throw new ServiceException("订单不存在");
+ }
+ order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+ orderMapper.updateById(order);
+ Integer orderType = order.getOrderType();
+
+ // 售后设置
+ R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
+ if (R.isError(baseSettingR)) {
+ throw new ServiceException("售后设置获取失败");
+ }
+ BaseSetting baseSetting = baseSettingR.getData();
+ if (baseSetting == null) {
+ throw new ServiceException("售后设置获取失败");
+ }
+ String content = baseSetting.getContent();
+ JSONObject jsonObject = JSONObject.parseObject(content);
+ Long days = jsonObject.getLong("days");
+ commissionService.addToCommissionDelayQueue(order.getId(), LocalDateTime.now().plusDays(days));
+ }
+
+
+ /**
+ * 管理后台获取订单列表数据
+ * @param orderPageList
+ * @return
+ */
+ @Override
+ public List<OrderPageListVo> getOrderPageList(OrderPageList orderPageList) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ if(2 == sysUser.getRoleType()){
+ orderPageList.setShopId(sysUser.getObjectId());
+ }
+ //搜索条件，用户姓名
+ if(StringUtils.isNotEmpty(orderPageList.getUserName())){
+ List<AppUser> data = appUserClient.getAppUserByName(orderPageList.getUserName()).getData();
+ List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if(null != orderPageList.getAppUserIds()){
+ List<Long> appUserIds = orderPageList.getAppUserIds();
+ appUserIds.addAll(collect);
+ orderPageList.setAppUserIds(appUserIds);
+ }else{
+ orderPageList.setAppUserIds(collect);
+ }
+ }
+ //搜索条件，用户电话
+ if(StringUtils.isNotEmpty(orderPageList.getPhone())){
+ List<AppUser> data = appUserClient.getAppUserByPhone(orderPageList.getPhone()).getData();
+ List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if(null != orderPageList.getAppUserIds()){
+ List<Long> appUserIds = orderPageList.getAppUserIds();
+ appUserIds.addAll(collect);
+ orderPageList.setAppUserIds(appUserIds);
+ }else{
+ orderPageList.setAppUserIds(collect);
+ }
+ }
+
+ List<OrderPageListVo> list = this.baseMapper.getOrderPageList(orderPageList);
+ for (OrderPageListVo orderPageListVo : list) {
+ Long appUserId = orderPageListVo.getAppUserId();
+ AppUser appUser = appUserClient.getAppUserById(appUserId);
+ orderPageListVo.setUserName(appUser.getName());
+ orderPageListVo.setPhone(appUser.getPhone());
+ }
+ return list;
+ }
+
+
+ /**
+ * 确认发货操作
+ * @param orderId
+ * @param code
+ * @return
+ */
+ @Override
+ public R confirmDelivery(String orderId, String code) {
+ Order order = this.getById(orderId);
+ if(1 == order.getPayStatus()){
+ return R.fail("订单还未完成支付");
+ }
+ if(1 == order.getOrderType() || null == order.getAddressJson()){
+ return R.fail("该订单不支付快递配送");
+ }
+ if(1 != order.getOrderStatus()){
+ return R.fail("无效的操作");
+ }
+ //添加快递号和修改订单状态
+ order.setExpressJson(code);
+ order.setOrderStatus(2);
+ this.updateById(order);
+ return R.ok();
+ }
+
+
+ /**
+ * 取消订单操作
+ * @param orderId
+ * @return
+ */
+ @Override
+ public R cancelOrder(Long orderId) {
+ Order order = this.getById(orderId);
+ if(Arrays.asList(4, 5, 6, 7, 8).contains(order.getOrderStatus())){
+ return R.fail("无效的操作");
+ }
+ order.setOrderStatus(5);
+ this.updateById(order);
+ refundPayMoney(order);
+ return R.ok();
+ }
+
+
+ /**
+ * 返回订单支付金额和回退积分和会员等级
+ * @param order
+ */
+ public void refundPayMoney(Order order){
+ //开始退款
+ Integer payMethod = order.getPayMethod();
+ BigDecimal paymentAmount = order.getPaymentAmount();
+ AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+ if(1 == payMethod){
+ //微信退款
+ }
+ if(2 == payMethod){
+ //余额退款
+ 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));
+ appUser.setBalance(balance.add(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
+ appUser.setShopAmount(appUser.getShopAmount().subtract(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
+
+ //构建账户余额流水明细
+ BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
+ balanceChangeRecord.setOrderId(order.getId());
+ balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setChangeType(6);
+ balanceChangeRecord.setBeforeAmount(balance);
+ balanceChangeRecord.setChangeAmount(paymentAmount);
+ balanceChangeRecord.setAfterAmount(appUser.getBalance());
+ balanceChangeRecord.setDelFlag(0);
+ balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+ }
+ 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()){
+ //微信退款
+ }
+ 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));
+ appUser.setBalance(balance.add(expressAmount).setScale(2, RoundingMode.HALF_EVEN));
+ //构建账户余额流水明细
+ BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
+ balanceChangeRecord.setOrderId(order.getId());
+ balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setChangeType(6);
+ balanceChangeRecord.setBeforeAmount(balance);
+ balanceChangeRecord.setChangeAmount(expressAmount);
+ balanceChangeRecord.setAfterAmount(appUser.getBalance());
+ balanceChangeRecord.setDelFlag(0);
+ balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+ }
+ }
+ }
+ //退回获得的消费积分
+ //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
+ 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 = getPoint / (100 - pointSetting.getBuyPoint());
+ }
+ appUser.setLavePoint(lavePoint - getPoint);
+ appUser.setShopPoint(appUser.getShopPoint() - earnPoint1);
+ appUser.setTotalPoint(appUser.getTotalPoint() - earnPoint1);
+ if(vipDemotion){
+ appUser.setVipId(appUser.getVipId() - 1);
+ }
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ Integer point = appUser.getLavePoint() - lavePoint;
+ userPoint.setVariablePoint(point >= 0 ? point : point * -1);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
+ }
+
+
+
+ /**
+ * 会员降级检测
+ */
+ public boolean vipDemotion(Integer shopPoint, Integer vipId){
+ if(vipId == 1 || vipId > 3){
+ return false;
+ }
+ VipSetting vipSetting = vipSettingClient.getVipSetting(vipId).getData();
+ Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
+ Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
+ if(1 == vipLevelUpShopRole && shopPoint < vipLevelUpShop){
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * 收货操作
+ * @param orderId
+ * @return
+ */
+ @Override
+ public R receivingOperation(Long orderId) {
+ Order order = this.getById(orderId);
+ if(order.getOrderStatus() != 2){
+ return R.fail("无效的操作");
+ }
+ order.setOrderStatus(4);
+ this.updateById(order);
+ return R.ok();
+ }
+
+
+ /**
+ * 获取订单详情
+ * @param orderId
+ * @return
+ */
+ @Override
+ public OrderInfoVo getOrderInfo(Long orderId) {
+ Order order = this.getById(orderId);
+ OrderInfoVo orderInfo = new OrderInfoVo();
+ orderInfo.setId(orderId.toString());
+ orderInfo.setOrderNumber(order.getOrderNumber());
+ 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()) ? "单品-快递配送" : "单品-自提"));
+ Shop shop = shopClient.getShopById(order.getShopId()).getData();
+ if(null != shop){
+ orderInfo.setShopName(shop.getName());
+ }
+ orderInfo.setPaymentMethod(order.getPayMethod());
+ orderInfo.setTotalAmount(order.getTotalAmount());
+ if(StringUtils.isNotEmpty(order.getCouponJson())){
+ CouponInfo couponInfo = JSON.parseObject(order.getCouponJson(), CouponInfo.class);
+ orderInfo.setCouponName(couponInfo.getCouponName());
+ }
+ orderInfo.setDiscountAmount(order.getDiscountTotalAmount());
+ orderInfo.setExpressAmount(order.getExpressAmount());
+ orderInfo.setPaymentAmount(order.getPaymentAmount());
+ orderInfo.setPoint(order.getGetPoint());
+ if(StringUtils.isNotEmpty(order.getAddressJson())){
+ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
+ orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
+ 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);
+ }
+ List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
+ int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
+ orderInfo.setGoodsNum(sum);
+ List<Object> goodsJson = new ArrayList<>();
+ for (OrderGood orderGood : orderGoods) {
+ Goods goods = JSON.parseObject(orderGood.getGoodJson(), Goods.class);
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", goods.getName());
+ map.put("imgUrl", goods.getHomePagePicture());
+ map.put("number", orderGood.getNum());
+ goodsJson.add(map);
+ }
+ orderInfo.setGoodsJson(JSON.toJSONString(goodsJson));
+ return orderInfo;
}
}
--
Gitblit v1.7.1