From 6e686b5f3e261b7c6a0bd95993a3dceceeeea9ab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 15:34:16 +0800
Subject: [PATCH] 20210625 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 93eb34e..0705db4 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
@@ -23,10 +24,7 @@
import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@Transactional
@@ -86,6 +84,10 @@
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
viewOrderVo = objectMapper.convertValue(scoreOrder, ViewOrderVo.class);
+// String voucherImg = viewOrderVo.getVoucherImg();
+ String voucherImg = scoreOrder.getVoucherImg();
+ List<String> lists = StrUtil.split(voucherImg, ",");
+ viewOrderVo.setVoucherImgs(lists);
//2-待收货3-已收货4-已完成5-已评价,获取物流信息
Integer status = scoreOrder.getStatus() == null ? 0:scoreOrder.getStatus();
if(ScoreOrder.STATUS_DOING == status
@@ -139,7 +141,7 @@
public Long insureOrder(InsureOrderDto model) {
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(model.getId());
- scoreOrder.setVoucherImg(model.getVoucherImgs().toString());
+ scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
return scoreOrder.getId();
}
--
Gitblit v1.9.1