From 9d7e27bfc73ebc50987d63623c5c2c18241969ab Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:49:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 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 4cc2af1..93eb34e 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
@@ -7,19 +7,17 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.xzx.gc.entity.ScoreExpressInfo;
-import com.xzx.gc.entity.ScoreGoodsStyle;
-import com.xzx.gc.entity.ScoreOrder;
-import com.xzx.gc.entity.ScoreOrderDetails;
+import com.xzx.gc.entity.*;
+import com.xzx.gc.shop.dto.AddGoodsOrderDto;
import com.xzx.gc.shop.dto.DeliverGoodsDto;
+import com.xzx.gc.shop.dto.InsureOrderDto;
import com.xzx.gc.shop.dto.QueryOrderListDto;
-import com.xzx.gc.shop.mapper.ScoreExpressInfoMapper;
-import com.xzx.gc.shop.mapper.ScoreOrderDetailsMapper;
-import com.xzx.gc.shop.mapper.ScoreOrderMapper;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
@@ -43,6 +41,21 @@
@Resource
ScoreOrderDetailsMapper scoreOrderDetailsMapper;
+
+ @Resource
+ private AddressInfoMapper addressInfoMapper;
+
+ @Autowired
+ private AccountInfoMapper accountInfoMapper;
+
+ @Autowired
+ private ScoreGoodsStyleMapper scoreGoodsStyleMapper;
+
+ @Autowired
+ private ScoreGoodsSkuMapper scoreGoodsSkuMapper;
+
+ @Autowired
+ private ScoreGoodsMapper scoreGoodsMapper;
public Map<String, Object> queryOrderList(QueryOrderListDto model) {
String name = model.getName();
@@ -73,9 +86,12 @@
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
viewOrderVo = objectMapper.convertValue(scoreOrder, ViewOrderVo.class);
- //2-待收货,3-已完成,获取物流信息
+ //2-待收货3-已收货4-已完成5-已评价,获取物流信息
Integer status = scoreOrder.getStatus() == null ? 0:scoreOrder.getStatus();
- if(ScoreOrder.STATUS_ING == status || ScoreOrder.STATUS_DONE == 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);
@@ -114,9 +130,27 @@
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(id);
- scoreOrder.setStatus(ScoreOrder.STATUS_ING);
+ scoreOrder.setStatus(ScoreOrder.STATUS_ON);
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
}
- return scoreExpressInfo.getId();
+ return id;
+ }
+
+ public Long insureOrder(InsureOrderDto model) {
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(model.getId());
+ scoreOrder.setVoucherImg(model.getVoucherImgs().toString());
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ return scoreOrder.getId();
+ }
+
+ public void addOrder(AddGoodsOrderDto addGoodsOrderDto) {
+ ScoreGoodsStyle style = scoreGoodsStyleMapper.selectByPrimaryKey(addGoodsOrderDto.getStyleId());
+ ScoreGoodsSku sku = scoreGoodsSkuMapper.selectByPrimaryKey(addGoodsOrderDto.getSkuId());
+ ScoreGoods goods = scoreGoodsMapper.selectByPrimaryKey(style.getGoodsId());
+
+
+ AddressInfo addressInfo = addressInfoMapper.selectByPrimaryKey(addGoodsOrderDto.getAddressId());
+ AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
}
}
--
Gitblit v1.9.1