conflect

Helius

2021-06-25 cd56d5963f7234a03fec057d807ad1607be17c23

 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java

@@ -28,10 +28,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@Service
@Transactional
@@ -96,6 +93,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.splitTrim(voucherImg, ",");
            viewOrderVo.setVoucherImgs(lists);
            //2-待收货3-已收货4-已完成5-已评价,获取物流信息
            Integer status = scoreOrder.getStatus() == null ? 0:scoreOrder.getStatus();
            if(ScoreOrder.STATUS_DOING == status
@@ -149,7 +150,8 @@
    public Long insureOrder(InsureOrderDto model) {
        ScoreOrder scoreOrder = new ScoreOrder();
        scoreOrder.setId(model.getId());
        scoreOrder.setVoucherImg(model.getVoucherImgs().toString());
        scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
        scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
        return scoreOrder.getId();
    }