From aa8f41d3b4fcc7aae0bd50fdea92b126f22485df Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 05 五月 2023 18:34:54 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 191 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 190 insertions(+), 1 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 9a4f812..ee5a004 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
@@ -34,7 +34,6 @@
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import io.swagger.annotations.ApiModelProperty;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -340,10 +339,12 @@
order.setPayMoney(orderPayMoney);
order.setOnlinePayMoney(orderPayMoney);
appPlaceOrderVo.setPayMoney(orderPayMoney);
+ order.setCloseFlag(1);
}else if(order.getPayType()==2){
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
appPlaceOrderVo.setPayMoney(orderPayDeposit);
+ order.setCloseFlag(0);
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
@@ -500,6 +501,7 @@
SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
merVerifyOrderVo.setUserName(sysUser.getNickName());
merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
return merVerifyOrderVo;
}
@@ -520,6 +522,7 @@
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setOfflinePayMoney(relReceiveMoney);
order.setPayMoney(order.getPayMoney().add(relReceiveMoney));
+ order.setCloseFlag(1);
this.saveOrUpdate(order);
//创建服务商品
List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listVoByOrderId(orderId);
@@ -539,6 +542,7 @@
consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
+ consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
consumerGoods.setCreateTime(nowTime);
consumerGoodsService.save(consumerGoods);
}
@@ -560,4 +564,189 @@
merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
return merVerifyOrderVo;
}
+
+ /**
+ * 收银未结清订单列表
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ @Override
+ public List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberNoClearOrder(page,merMemberNoClearOrderDto.getMemberUserId());
+ if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
+ merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ }
+ }
+ return merMemberNoClearOrderVoList;
+ }
+
+ /**
+ * 结清订单
+ * @param merCloseOrderDto
+ */
+ @Override
+ public void merCloseOrder(MerCloseOrderDto merCloseOrderDto){
+ Order order = this.getById(merCloseOrderDto.getOrderId());
+ order.setOfflinePayMoney(merCloseOrderDto.getPayMoney());
+ order.setPayMoney(order.getPayMoney().add(merCloseOrderDto.getPayMoney()));
+ order.setCloseFlag(1);
+ this.saveOrUpdate(order);
+ }
+
+ /**
+ * 创建新订单
+ * @param merNewOrderDto
+ */
+ @Override
+ public void createNewOrder(MerNewOrderDto merNewOrderDto){
+ Long userId = merNewOrderDto.getBuyUserId();
+ //创建订单
+ List<AppBuyGoodsDto> appBuyGoodsDtoList = merNewOrderDto.getAppBuyGoodsDtoList();
+ String goodsId;
+ Integer buyNum;
+ BigDecimal buyNumBig;
+ Integer serviceNum;
+ Integer goodsNum = 0;
+ Long userCouponId;
+ Goods goods;
+ BigDecimal goodsPrice;
+ BigDecimal goodsTotalPrice;
+ BigDecimal goodsRealPrice;
+ List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
+ Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
+ AppUserCouponVo appUserCouponVo;
+ Integer couponType;
+ BigDecimal moneyThreshold;
+ BigDecimal discountMoney = new BigDecimal("0.00");
+ BigDecimal discountPercent;
+ BigDecimal goodsDeposit;
+ BigDecimal orderGoodsMoney = new BigDecimal("0.00");
+ BigDecimal couponDiscount = new BigDecimal("0.00");
+ BigDecimal orderPayDeposit = new BigDecimal("0.00");
+ BigDecimal orderPayMoney = new BigDecimal("0.00");
+ String orderId = IdUtils.simpleUUID();
+ String orderNo = CodeFactoryUtil.getShopOrderNo();
+ OrderGoods orderGoods;
+ String orderGoodsId;
+ for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
+ goodsId = appBuyGoodsDto.getGoodsId();
+ userCouponId = appBuyGoodsDto.getUserCouponId();
+ goods = goodsService.getById(goodsId);
+ buyNum = appBuyGoodsDto.getBuyNum();
+ goodsPrice = goods.getSalesPrice();
+ serviceNum = goods.getServiceNum();
+ //商户定制价格
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merNewOrderDto.getShopId(),goods.getGoodsId());
+ if(shopGoods!=null){
+ goodsPrice = shopGoods.getSalesPrice();
+ serviceNum = shopGoods.getServiceNum();
+ }
+ buyNumBig = BigDecimal.valueOf(buyNum);
+ goodsTotalPrice = goodsPrice.multiply(buyNumBig);
+ goodsRealPrice = goodsTotalPrice;
+ if(userCouponId!=null){
+ appUserCouponVo = appUserCouponVoMap.get(userCouponId);
+ if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
+ couponType = appUserCouponVo.getCouponType();
+ if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
+ moneyThreshold = appUserCouponVo.getMoneyThreshold();
+ if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
+ discountMoney = appUserCouponVo.getDiscountMoney();
+ goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+ }
+ }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
+ discountPercent = appUserCouponVo.getDiscountPercent();
+ goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
+ discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
+ }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
+ discountMoney = appUserCouponVo.getDiscountMoney();
+ goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+ }
+ }
+ }
+
+ goodsDeposit = goods.getSubscription();
+ if(goodsDeposit == null){
+ goodsDeposit = new BigDecimal("0.00");
+ }
+ goodsNum = goodsNum + buyNum;
+ orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
+ couponDiscount = couponDiscount.add(discountMoney);
+ orderPayDeposit = orderPayDeposit.add(goodsDeposit);
+ orderPayMoney = orderPayMoney.add(goodsRealPrice);
+ //创建OrderGoods
+ orderGoods = new OrderGoods();
+ orderGoodsId = IdUtils.simpleUUID();
+ orderGoods.setOrderGoodsId(orderGoodsId);
+ orderGoods.setDelFlag(0);
+ orderGoods.setOrderId(orderId);
+ orderGoods.setGoodsId(goodsId);
+ orderGoods.setBuyNum(buyNum);
+ orderGoods.setCouponId(userCouponId.toString());
+ orderGoods.setGoodsPrice(goodsPrice);
+ orderGoods.setGoodsTotalMoney(orderGoodsMoney);
+ orderGoods.setGoodsReceivableMoney(goodsRealPrice);
+ orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
+ orderGoods.setServiceNum(serviceNum);
+ orderGoods.setGoodsType(goods.getGoodsType());
+ orderGoodsService.save(orderGoods);
+ }
+ Order order = new Order();
+ order.setOrderId(orderId);
+ order.setDelFlag(0);
+ order.setOrderStatus(3);
+ order.setOrderNo(orderNo);
+ order.setOrderFrom(1);
+ order.setShopId(merNewOrderDto.getShopId());
+ order.setUserId(userId);
+ order.setOrderMoney(orderGoodsMoney);
+ order.setCouponMoney(couponDiscount);
+ order.setDiscountMoney(couponDiscount);
+ order.setReceivableMoney(orderPayMoney);
+ order.setPayType(1);
+ if(order.getPayType()==1){
+ order.setPayMoney(orderPayMoney);
+ order.setOnlinePayMoney(orderPayMoney);
+ order.setCloseFlag(1);
+ }else if(order.getPayType()==2){
+ order.setPayMoney(orderPayDeposit);
+ order.setOnlinePayMoney(orderPayDeposit);
+ order.setCloseFlag(0);
+ }
+ order.setOrderRemark(merNewOrderDto.getOrderRemark());
+ order.setGoodsNum(goodsNum);
+ order.setCreateTime(new Date());
+ order.setPayTime(new Date());
+ order.setUseTime(new Date());
+ order.setUseUserId(merNewOrderDto.getUserId());
+ order.setPayMoney(merNewOrderDto.getPayMoney());
+ order.setOnlinePayMoney(new BigDecimal("0.00"));
+ order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
+ order.setCloseFlag(1);
+ this.save(order);
+ //创建服务
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listVoByOrderId(orderId);
+ ConsumerGoods consumerGoods;
+ String consumerGoodsId;
+ for(AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList){
+ consumerGoods = new ConsumerGoods();
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderGoodsId(appUserOrderGoodsPageVo.getOrderGoodsId());
+ consumerGoods.setGoodsId(appUserOrderGoodsPageVo.getGoodsId());
+ consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
+ consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
+ consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
+ consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
+ consumerGoods.setCreateTime(new Date());
+ consumerGoodsService.save(consumerGoods);
+ }
+ }
}
--
Gitblit v1.7.1