订单

yujian

2020-06-09 21bd2703882cf7f34e85c6f714a4f528aa539788

订单

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -89,6 +89,7 @@
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.suning.SuningApiUtil;
import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -104,7 +105,6 @@

@Service
public class CommonOrderServiceImpl implements CommonOrderService {
	

    @Resource
    private CommonOrderMapper commonOrderMapper;
@@ -1270,7 +1270,7 @@
            {
                SuningGoodsInfo pddGoods = null;
                // TODO 需要获取
                pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), suningOrderInfo.getSellerCode());
                pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), "00000000");
                if (pddGoods != null) {
                    cog = CommonOrderGoodsFactory.create(pddGoods);
                }
@@ -1971,8 +1971,7 @@

    @Override
    public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
            String startTime, String endTime, Integer dateType, List<Integer> listSource)
            throws CommonOrderException {
            String startTime, String endTime, Integer dateType, List<Integer> listSource) {
        return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
                listSource);
    }
@@ -1990,6 +1989,8 @@
        List<String> listTB = new ArrayList<String>();
        List<String> listJD = new ArrayList<String>();
        List<String> listPDD = new ArrayList<String>();
        List<String> listVIP = new ArrayList<String>();
        List<String> listSuNing = new ArrayList<String>();
        for (CommonOrderVO order : listOrder) {
            if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
                    || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_YIJI
@@ -2013,6 +2014,10 @@
                listJD.add(order.getOrderNo());
            } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
                listPDD.add(order.getOrderNo());
            } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
                listVIP.add(order.getOrderNo());
            } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
                listSuNing.add(order.getOrderNo());
            }
        }

@@ -2031,6 +2036,17 @@
            listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
        }

        List<UserSystemCouponRecord> listRecordVIP = null;
        if (listVIP.size() > 0) {
            listRecordVIP = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_VIP, listVIP);
        }

        List<UserSystemCouponRecord> listRecordSuNing = null;
        if (listSuNing.size() > 0) {
            listRecordSuNing = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_SUNING, listSuNing);
        }
		
		
        SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
        SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
        // 是否存在奖励券
@@ -2093,6 +2109,10 @@
                    Integer goodsType = commonGoodsVO.getGoodsType();
                    if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) {
                        order.setOrderType(Constant.SOURCE_TYPE_ELME); // 饿了么订单
                    }
					
                    if (goodsType == Constant.SOURCE_TYPE_SUNING) {
                        commonGoodsVO.setGoodsId(SuningUtil.getConcatGoodsIId(commonGoodsVO.getShopId() +"", commonGoodsVO.getGoodsId()));
                    }
                    order.getListOrderGoods().add(commonGoodsVO);
                }
@@ -2209,6 +2229,10 @@
                    couponUseFactory(order, listRecordJD);
                } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
                    couponUseFactory(order, listRecordPDD);
                } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
                    couponUseFactory(order, listRecordVIP);
                } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
                    couponUseFactory(order, listRecordSuNing);
                }
            } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
                // 分享