xzx.git - Gitblit

			@@ -3,32 +3,28 @@
			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;
			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;

			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
			@@ -43,6 +39,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 +84,16 @@
			ObjectMapper objectMapper = new ObjectMapper();
			objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
			viewOrderVo = objectMapper.convertValue(scoreOrder, ViewOrderVo.class);
			//2-待收货,3-已完成,获取物流信息
			// 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_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 +114,7 @@
			return viewOrderVo;
			}

			public void deliverGoods(DeliverGoodsDto model) {
			public Long deliverGoods(DeliverGoodsDto model) {
			/**
			* 获取物流表的信息
			* 更新物流信息
			@@ -107,12 +125,34 @@
			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 id;
			}

			public Long insureOrder(InsureOrderDto model) {
			ScoreOrder scoreOrder = new ScoreOrder();
			scoreOrder.setId(model.getId());
			scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
			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());
			}
			}