From c1765eeb4448754e52c66601e5ee20820868f6c5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 11:25:50 +0800
Subject: [PATCH] 20210625 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 04201e4..6b45805 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
@@ -12,6 +12,7 @@
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.entity.ScoreOrderDetails;
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;
@@ -73,9 +74,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);
@@ -96,7 +100,7 @@
return viewOrderVo;
}
- public void deliverGoods(DeliverGoodsDto model) {
+ public Long deliverGoods(DeliverGoodsDto model) {
/**
* 获取物流表的信息
* 更新物流信息
@@ -107,12 +111,24 @@
Example.Criteria criteriaExpress = exampleExpress.createCriteria();
criteriaExpress.andEqualTo("orderId",id);
ScoreExpressInfo scoreExpressInfo = scoreExpressInfoMapper.selectOneByExample(exampleExpress);
- scoreExpressInfo.setExpressNo(model.getExpressNo());
- scoreExpressInfo.setExpressCom(model.getExpressCom());
- scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
+ if(ObjectUtil.isNotEmpty(scoreExpressInfo)){
+ scoreExpressInfo.setExpressNo(model.getExpressNo());
+ scoreExpressInfo.setExpressCom(model.getExpressCom());
+ scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
- ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
- scoreOrder.setStatus(ScoreOrder.STATUS_ING);
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(id);
+ scoreOrder.setStatus(ScoreOrder.STATUS_ON);
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ }
+ return scoreExpressInfo.getId();
+ }
+
+ public Long insureOrder(InsureOrderDto model) {
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(model.getId());
+ scoreOrder.setVoucherImg(model.getVoucherImgs().toString());
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ return scoreOrder.getId();
}
}
--
Gitblit v1.9.1