From 38d980c51678f8eca8486a83a6667f9075edb08f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 18:14:23 +0800
Subject: [PATCH] 20210625 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 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 0705db4..eecba39 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,11 +8,12 @@
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.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.dto.*;
import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.ExpressInfoVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
@@ -24,6 +25,7 @@
import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
@Service
@@ -54,6 +56,11 @@
@Autowired
private ScoreGoodsMapper scoreGoodsMapper;
+ @Autowired
+ private ScoreDetailsMapper scoreDetailsMapper;
+
+ @Autowired
+ private IdUtils idUtils;
public Map<String, Object> queryOrderList(QueryOrderListDto model) {
String name = model.getName();
@@ -63,6 +70,12 @@
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<>();
@@ -86,21 +99,21 @@
viewOrderVo = objectMapper.convertValue(scoreOrder, ViewOrderVo.class);
// String voucherImg = viewOrderVo.getVoucherImg();
String voucherImg = scoreOrder.getVoucherImg();
- List<String> lists = StrUtil.split(voucherImg, ",");
+ List<String> lists = StrUtil.splitTrim(voucherImg, ",");
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();
@@ -141,6 +154,7 @@
public Long insureOrder(InsureOrderDto model) {
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(model.getId());
+ scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
return scoreOrder.getId();
@@ -150,9 +164,86 @@
ScoreGoodsStyle style = scoreGoodsStyleMapper.selectByPrimaryKey(addGoodsOrderDto.getStyleId());
ScoreGoodsSku sku = scoreGoodsSkuMapper.selectByPrimaryKey(addGoodsOrderDto.getSkuId());
ScoreGoods goods = scoreGoodsMapper.selectByPrimaryKey(style.getGoodsId());
+ if (goods == null || ScoreGoods.ISSALE_NO.equals(goods.getIsSale())) {
+ throw new RestException(-3, "商品不存在或已下架");
+ }
+ AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
+ if (accountInfo.getCollectScore() == null) {
+ throw new RestException(-3, "积分不足");
+ }
+
+ BigDecimal totalPrice = sku.getPresentPrice().multiply(BigDecimal.valueOf(addGoodsOrderDto.getCnt()));
+ BigDecimal score = new BigDecimal(accountInfo.getCollectScore());
+ if (score.compareTo(totalPrice) < 0) {
+ throw new RestException(-3, "积分不足");
+ }
+
+ ScoreOrder order = new ScoreOrder();
+ order.setOrderNo(idUtils.generate("JF", 9));
+ order.setCnt(addGoodsOrderDto.getCnt());
+ order.setTotalPrice(totalPrice);
+ order.setCreatedTime(new Date());
+ order.setUserId(addGoodsOrderDto.getUserId());
+ order.setStatus(ScoreOrder.STATUS_READY);
+ order.setGoodsName(goods.getName());
+ order.setRemark(addGoodsOrderDto.getRemark());
+ scoreOrderMapper.insert(order);
+
+ ScoreOrderDetails orderDetails = new ScoreOrderDetails();
+ orderDetails.setGoodsName(goods.getName());
+ orderDetails.setStyle(style.getName());
+ orderDetails.setSku(sku.getName());
+ orderDetails.setOrderId(order.getId());
+ orderDetails.setCnt(addGoodsOrderDto.getCnt());
+ orderDetails.setTotalPrice(totalPrice);
+ orderDetails.setUnitPrice(sku.getPresentPrice());
+ orderDetails.setGoodsId(goods.getId());
+ orderDetails.setThumb(goods.getThumb());
+ scoreOrderDetailsMapper.insert(orderDetails);
AddressInfo addressInfo = addressInfoMapper.selectByPrimaryKey(addGoodsOrderDto.getAddressId());
- AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
+ ScoreExpressInfo expressInfo = new ScoreExpressInfo();
+ expressInfo.setUsername(addressInfo.getRelaName());
+ expressInfo.setPhone(addressInfo.getMobilePhone());
+ expressInfo.setUserId(addressInfo.getUserId());
+ expressInfo.setOrderId(order.getId());
+ StringBuffer address = new StringBuffer();
+ address.append(addressInfo.getAddressArea());
+ address.append(addressInfo.getDetailAddress());
+ if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+ if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+ address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
+ }
+ }
+ expressInfo.setAddress(address.toString());
+ expressInfo.setCreatedTime(new Date());
+ scoreExpressInfoMapper.insert(expressInfo);
+
+ BigDecimal remianScore = score.subtract(totalPrice).setScale(0, BigDecimal.ROUND_DOWN);
+ accountInfo.setCollectScore(remianScore.toString());
+ accountInfoMapper.updateByPrimaryKey(accountInfo);
+
+ ScoreDetails scoreDetails = new ScoreDetails();
+ scoreDetails.setOrderNo(order.getOrderNo());
+ scoreDetails.setUserId(addGoodsOrderDto.getUserId());
+ scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);
+ scoreDetails.setOriginalScore(score);
+ scoreDetails.setCurrentScore(remianScore);
+ scoreDetails.setChangeScore(totalPrice);
+ scoreDetailsMapper.insert(scoreDetails);
+ }
+
+ public Long cancelOrder(CancelOrderDto model) {
+ /**
+ * todo 只更新了订单状态，后续操作待增加
+ */
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(model.getId());
+ scoreOrder.setStatus(ScoreOrder.STATUS_CANCEL);
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ return scoreOrder.getId();
}
}
--
Gitblit v1.9.1