From 45889b86398acccce5ede4f437e8635e6ff6fd00 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 19 五月 2023 20:05:14 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 7b8da7d..a96e082 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
@@ -16,11 +16,13 @@
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.pojo.order.OrderGoods;
+import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.goods.GoodsFileService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
+import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.order.util.CodeFactoryUtil;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteShopService;
@@ -28,6 +30,7 @@
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
@@ -82,6 +85,9 @@
@Resource
private ConsumerGoodsService consumerGoodsService;
+
+ @Resource
+ private ShoppingCartService shoppingCartService;
/**
* @description: buyGoods
@@ -244,6 +250,8 @@
String orderNo = CodeFactoryUtil.getShopOrderNo();
OrderGoods orderGoods;
String orderGoodsId;
+ ShoppingCart shoppingCart;
+ HashSet<String> goodsTypeSet = new HashSet<>();
for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
appSureOrderGoodsVo = new AppSureOrderGoodsVo();
useCoupon = 0;
@@ -326,6 +334,17 @@
orderGoods.setServiceNum(serviceNum);
orderGoods.setGoodsType(goods.getGoodsType());
orderGoodsService.save(orderGoods);
+ //清空购物车
+ shoppingCartService.deleteByUserIdAndGoodsId(userId,goodsId);
+ if(goods.getGoodsType()==1){
+ goodsTypeSet.add("周期");
+ }else if(goods.getGoodsType()==2){
+ goodsTypeSet.add("服务");
+ }else if(goods.getGoodsType()==3){
+ goodsTypeSet.add("体验");
+ }else if(goods.getGoodsType()==4){
+ goodsTypeSet.add("单品");
+ }
}
Order order = new Order();
order.setOrderId(orderId);
@@ -358,10 +377,18 @@
order.setGoodsNum(goodsNum);
order.setCreateTime(new Date());
this.save(order);
+ //更新用户商品类型
+ if(goodsTypeSet!=null&&goodsTypeSet.size()>0){
+ AppMemberGoodsTypeDto appMemberGoodsTypeDto = new AppMemberGoodsTypeDto();
+ appMemberGoodsTypeDto.setUserId(userId);
+ appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
+ remoteMemberService.updateMemberGoodsType(appMemberGoodsTypeDto);
+ }
appPlaceOrderVo.setOrderId(orderId);
appPlaceOrderVo.setOrderNo(orderNo);
//调用支付
+
return appPlaceOrderVo;
}
@@ -513,6 +540,9 @@
merVerifyOrderVo.setReceivableMoney(order.getReceivableMoney());
merVerifyOrderVo.setPayMoney(order.getPayMoney());
merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
merVerifyOrderVo.setUserName(sysUser.getNickName());
@@ -577,6 +607,9 @@
merVerifyOrderVo.setPayMoney(order.getPayMoney());
merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
merVerifyOrderVo.setUserName(sysUser.getNickName());
merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
--
Gitblit v1.7.1