From 13f17e5f0f2bc304dbfbfd62e31786fd5ec26dd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 10:38:35 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 148 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 138 insertions(+), 10 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 8cb02dd..1ecd9e8 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -8,15 +8,14 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.*;
-import com.xzx.gc.shop.vo.ExpressInfoVo;
-import com.xzx.gc.shop.vo.QueryOrderListVo;
-import com.xzx.gc.shop.vo.ViewOrderVo;
+import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -62,13 +61,19 @@
private IdUtils idUtils;
public Map<String, Object> queryOrderList(QueryOrderListDto model) {
- String name = model.getName();
+ String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
String orderNo = model.getOrderNo();
Integer status = model.getStatus() == null ? 0 : model.getStatus();
Date createdTimeStart = model.getCreatedTimeStart();
Date createdTimeEnd = model.getCreatedTimeEnd();
PageHelper.startPage(model.getPage(), model.getLimit());
List<QueryOrderListVo> maps = scoreOrderMapper.queryOrderList(name,orderNo,status,createdTimeStart,createdTimeEnd);
+ if(CollUtil.isNotEmpty(maps)){
+ for(QueryOrderListVo queryOrderListVo : maps){
+ String decode = StringUtils.decode(queryOrderListVo.getName());
+ queryOrderListVo.setName(decode);
+ }
+ }
PageInfo pageInfo = new PageInfo(maps);
int count = Convert.toInt(pageInfo.getTotal());
Map<String, Object> map = new HashMap<>();
@@ -96,17 +101,17 @@
viewOrderVo.setVoucherImgs(lists);
//2-待收货3-已收货4-已完成5-已评价,获取物流信息
Integer status = scoreOrder.getStatus() == null ? 0:scoreOrder.getStatus();
- if(ScoreOrder.STATUS_DOING == status
- || ScoreOrder.STATUS_DONE == status
- || ScoreOrder.STATUS_ON == status
- || ScoreOrder.STATUS_EVALUATE == status){
+// if(ScoreOrder.STATUS_DOING == status
+// || ScoreOrder.STATUS_DONE == status
+// || ScoreOrder.STATUS_ON == status
+// || ScoreOrder.STATUS_EVALUATE == status){
Example exampleExpress = new Example(ScoreExpressInfo.class);
Example.Criteria criteriaExpress = exampleExpress.createCriteria();
criteriaExpress.andEqualTo("orderId",id);
ScoreExpressInfo scoreExpressInfo = scoreExpressInfoMapper.selectOneByExample(exampleExpress);
ExpressInfoVo expressInfoVo = objectMapper.convertValue(scoreExpressInfo, ExpressInfoVo.class);
viewOrderVo.setExpressInfoVo(expressInfoVo);
- }
+// }
//订单详情
Example exampleDetails = new Example(ScoreOrderDetails.class);
Example.Criteria criteriaDetails = exampleDetails.createCriteria();
@@ -237,17 +242,140 @@
scoreDetails.setOriginalScore(score);
scoreDetails.setCurrentScore(remianScore);
scoreDetails.setChangeScore(totalPrice);
+ scoreDetails.setCreatedTime(new Date());
scoreDetailsMapper.insert(scoreDetails);
+
+ sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
+ sku.setQuantity(sku.getQuantity() - addGoodsOrderDto.getCnt());
+ scoreGoodsSkuMapper.updateByPrimaryKey(sku);
}
public Long cancelOrder(CancelOrderDto model) {
/**
- * todo 只更新了订单状态，后续操作待增加
+ * 更新订单状态
+ * 增加一条取消订单积分退回的记录
+ * 查询所有的订单详情，依次库存增加，销量减少
*/
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(model.getId());
scoreOrder.setStatus(ScoreOrder.STATUS_CANCEL);
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+
+ ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(model.getId());
+ Example exampleDetails = new Example(ScoreDetails.class);
+ Example.Criteria criteriaDetails = exampleDetails.createCriteria();
+ criteriaDetails.andEqualTo("orderNo",order.getOrderNo());
+ criteriaDetails.andEqualTo("userId",order.getUserId());
+ criteriaDetails.andEqualTo("type",ScoreDetails.SCORE_TYPE_SHOPPING);
+ ScoreDetails scoreDetails = scoreDetailsMapper.selectOneByExample(exampleDetails);
+ if(ObjectUtil.isNotEmpty(scoreDetails)){
+ AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(order.getUserId());
+ BigDecimal score = new BigDecimal(accountInfo.getCollectScore());
+ BigDecimal remianScore = score.add(scoreDetails.getChangeScore()).setScale(0, BigDecimal.ROUND_DOWN);
+ ScoreDetails scoreDetailsRet = new ScoreDetails();
+ scoreDetailsRet.setOrderNo(scoreDetails.getOrderNo());
+ scoreDetailsRet.setUserId(scoreDetails.getUserId());
+ scoreDetailsRet.setType(ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
+ scoreDetailsRet.setOriginalScore(score);
+ scoreDetailsRet.setCurrentScore(remianScore);
+ scoreDetailsRet.setChangeScore(scoreDetails.getChangeScore());
+ scoreDetailsRet.setCreatedTime(new Date());
+ scoreDetailsMapper.insert(scoreDetailsRet);
+ }
+
+ Example exampleScoreOrderDetails = new Example(ScoreOrderDetails.class);
+ Example.Criteria criteriaScoreOrderDetails = exampleScoreOrderDetails.createCriteria();
+ criteriaScoreOrderDetails.andEqualTo("orderId",order.getId());
+ List<ScoreOrderDetails> scoreOrderDetails = scoreOrderDetailsMapper.selectByExample(exampleScoreOrderDetails);
+ if(CollUtil.isNotEmpty(scoreOrderDetails)){
+ for(ScoreOrderDetails scoreOrderDetail : scoreOrderDetails){
+ ScoreGoodsSku scoreGoodsSku = scoreGoodsSkuMapper.selectByPrimaryKey(scoreOrderDetail.getSkuId());
+ if(ObjectUtil.isNotEmpty(scoreGoodsSku)){
+ scoreGoodsSku.setStock(scoreGoodsSku.getStock() + scoreOrderDetail.getCnt());
+ scoreGoodsSku.setQuantity(scoreGoodsSku.getQuantity() - scoreOrderDetail.getCnt());
+ scoreGoodsSkuMapper.updateByPrimaryKey(scoreGoodsSku);
+ }
+ }
+ }
return scoreOrder.getId();
}
+
+ public PageInfo<XcxOrderListVo> orderList(XcxOrderListDto xcxOrderListDto) {
+ PageHelper.startPage(xcxOrderListDto.getPageNo(), xcxOrderListDto.getPageSize());
+ List<XcxOrderListVo> data = scoreOrderMapper.selectXcxOrderList(xcxOrderListDto);
+ return new PageInfo<>(data);
+ }
+
+ public XcxOrderDetailsVo orderDetails(Long id) {
+ return scoreOrderMapper.selectXcxOrderDetails(id);
+ }
+
+ public void confirmOrder(Long id, String userId) {
+ ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);
+ if (order == null) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!order.getUserId().equals(userId)) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!ScoreOrder.STATUS_ON.equals(order.getStatus())) {
+ throw new RestException(-3, "暂不能确认收货");
+ }
+
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ }
+
+ public void cancelOrder(Long id, String userId) {
+ ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);
+ if (order == null) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!order.getUserId().equals(userId)) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!ScoreOrder.STATUS_READY.equals(order.getStatus())) {
+ throw new RestException(-3, "订单不能取消");
+ }
+
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_CANCEL, userId);
+
+
+ // 退积分
+ AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(userId);
+ BigDecimal score = new BigDecimal(accountInfo.getCollectScore()).add(order.getTotalPrice()).setScale(0, BigDecimal.ROUND_DOWN);
+
+ ScoreDetails scoreDetails = new ScoreDetails();
+ scoreDetails.setOriginalScore(new BigDecimal(accountInfo.getCollectScore()));
+ scoreDetails.setCurrentScore(score);
+ scoreDetails.setChangeScore(order.getTotalPrice());
+ scoreDetails.setOrderNo(order.getOrderNo());
+ scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
+ scoreDetails.setCreatedTime(new Date());
+ scoreDetails.setUserId(userId);
+ scoreDetailsMapper.insert(scoreDetails);
+
+ accountInfo.setCollectScore(score.toString());
+ accountInfoMapper.updateByPrimaryKey(accountInfo);
+
+
+
+ // 减销量 加库存
+ List<ScoreOrderDetails> details = scoreOrderDetailsMapper.selectOrderDetailsByOrderId(order.getId());
+ if (CollUtil.isNotEmpty(details)) {
+ for (ScoreOrderDetails detail : details) {
+ ScoreGoodsSku sku = scoreGoodsSkuMapper.selectByPrimaryKey(detail.getSkuId());
+ if (sku == null) {
+ continue;
+ }
+
+ sku.setQuantity(sku.getQuantity() - detail.getCnt());
+ sku.setStock(sku.getStock() + detail.getCnt());
+ scoreGoodsSkuMapper.updateByPrimaryKey(sku);
+ }
+ }
+ }
}
--
Gitblit v1.9.1