From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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 2c2e93d..0f21cd9 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.core.utils.uuid.UUID;
@@ -32,6 +33,7 @@
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -371,7 +373,7 @@
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
- order.setCreateTime(new Date());
+ order.setCreateTime(DateUtils.getNowDate());
this.save(order);
//更新用户商品类型
if(goodsTypeSet!=null&&goodsTypeSet.size()>0){
@@ -472,7 +474,7 @@
throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
}
order.setOrderStatus(0);
- order.setCancelTime(new Date());
+ order.setCancelTime(DateUtils.getNowDate());
this.saveOrUpdate(order);
}
@@ -557,7 +559,7 @@
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
- Date nowTime = new Date();
+ Date nowTime = DateUtils.getNowDate();
//更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(3);
@@ -813,9 +815,9 @@
}
order.setOrderRemark(merNewOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
- order.setCreateTime(new Date());
- order.setPayTime(new Date());
- order.setUseTime(new Date());
+ order.setCreateTime(DateUtils.getNowDate());
+ order.setPayTime(DateUtils.getNowDate());
+ order.setUseTime(DateUtils.getNowDate());
order.setUseUserId(merNewOrderDto.getUserId());
order.setPayMoney(merNewOrderDto.getPayMoney());
order.setOnlinePayMoney(new BigDecimal("0.00"));
@@ -842,7 +844,7 @@
consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
consumerGoods.setUsedNum(0);
consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
- consumerGoods.setCreateTime(new Date());
+ consumerGoods.setCreateTime(DateUtils.getNowDate());
consumerGoodsService.save(consumerGoods);
}
Member member = remoteMemberService.getMember(userId).getData();
@@ -927,4 +929,36 @@
}
return merMemberNoClearOrderVoList;
}
+
+ /**
+ * 获取用户订单统计
+ * @param mgtMemberOrderTotalDto
+ * @return
+ */
+ @Override
+ public MgtMemberOrderTotalVo getMgtMemberOrderTotal(MgtMemberOrderTotalDto mgtMemberOrderTotalDto){
+ MgtMemberOrderTotalVo mgtMemberOrderTotalVo = orderMapper.getMgtMemberOrderTotal(mgtMemberOrderTotalDto);
+ return mgtMemberOrderTotalVo;
+ }
+
+ /**
+ * 分页获取用户订单列表
+ * @param page
+ * @param mgtMemberOrderPageDto
+ * @return
+ */
+ @Override
+ public List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, MgtMemberOrderPageDto mgtMemberOrderPageDto){
+ List<MgtMemberOrderPageVo> mgtMemberOrderPageVoList = orderMapper.pageMgtMemberOrder(page, mgtMemberOrderPageDto);
+ if(mgtMemberOrderPageVoList!=null&&!mgtMemberOrderPageVoList.isEmpty()){
+ Long shopId;
+ Shop shop;
+ for(MgtMemberOrderPageVo mgtMemberOrderPageVo : mgtMemberOrderPageVoList){
+ shopId = mgtMemberOrderPageVo.getShopId();
+ shop = remoteShopService.getShop(shopId).getData();
+ mgtMemberOrderPageVo.setShopName(shop.getShopName());
+ }
+ }
+ return mgtMemberOrderPageVoList;
+ }
}
--
Gitblit v1.7.1