拼多多比价修改

admin

2020-09-05 1340beb67a9b6d777821d0139bcc7c9b0896ed4e

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

@@ -2,16 +2,14 @@

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import javax.annotation.Resource;

import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
@@ -161,6 +159,10 @@
    @Resource
    private RocketMQManager rocketMQManager;

    @Lazy
    @Resource
    private PDDOrderService pddOrderService;

    // 奖励订单图片
    public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";

@@ -277,6 +279,25 @@
                listPDD.add(commonOrderVO.getOrderNo());
            }
        }
        //查询拼多多的订单详情
        List<String> pddOrderSnList = new ArrayList<>();
        if (listPDD != null && listPDD.size() > 0) {
            for (String orderSn : listPDD)
                pddOrderSnList.add(orderSn);
        }
        List<PDDOrder> pddOrderList = pddOrderService.listByOrderSns(listPDD);
        Set<String> bjOrders = new HashSet<>();
        if (pddOrderList != null) {
            for (PDDOrder pdd : pddOrderList)
                if (pdd.getFailReason() != null && pdd.getFailReason().contains("比价"))
                    bjOrders.add(pdd.getOrderSn());
        }
        for (CommonOrderVO commonOrderVO : listOrder) {
            if (commonOrderVO.getSourceType() == Constant.SOURCE_TYPE_PDD && bjOrders.contains(commonOrderVO.getOrderNo())) {
                commonOrderVO.setOrderStateDesc("比价订单");
            }
        }


        List<UserSystemCouponRecord> listRecordTB = null;
        if (listTB.size() > 0) {
@@ -437,6 +458,10 @@
                hongBao = new BigDecimal(0);
            }

            //判断状态是否预设了的
            if (!StringUtil.isNullOrEmpty(order.getOrderStateDesc())) {
                orderStateContent = order.getOrderStateDesc();
            } else {
            if (CommonOrder.STATE_FK == orderState) {
                orderStateContent = "已付款";
            } else if (CommonOrder.STATE_JS == orderState) {
@@ -469,6 +494,7 @@
                                    .setWqHongBao("售后：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
                            hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
                            order.setWeiQuanInfo(weiQuanInfo);
                            }
                        }
                    }
                }
@@ -2023,6 +2049,19 @@
                listSuNing.add(order.getOrderNo());
            }
        }
        //查询拼多多的订单详情
        List<PDDOrder> pddOrderList = pddOrderService.listByOrderSns(listPDD);
        Set<String> bjOrders = new HashSet<>();
        if (pddOrderList != null) {
            for (PDDOrder pdd : pddOrderList)
                if (pdd.getFailReason() != null && pdd.getFailReason().contains("比价"))
                    bjOrders.add(pdd.getOrderSn());
        }
        for (CommonOrderVO commonOrderVO : listOrder) {
            if (commonOrderVO.getSourceType() == Constant.SOURCE_TYPE_PDD && bjOrders.contains(commonOrderVO.getOrderNo())) {
                commonOrderVO.setOrderStateDesc("比价订单");
            }
        }

        List<UserSystemCouponRecord> listRecordTB = null;
        if (listTB.size() > 0) {
@@ -2189,6 +2228,9 @@

            /* 订单状态 转换处理 */
            String orderStateContent = "";
            if(!StringUtil.isNullOrEmpty(order.getOrderStateDesc()))
                orderStateContent=order.getOrderStateDesc();
            else {
            if (CommonOrder.STATE_FK == orderState) {
                orderStateContent = "已付款";
            } else if (CommonOrder.STATE_JS == orderState) {
@@ -2213,6 +2255,7 @@
                    hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
                }
            }
            }
            orderStateMap.put("content", orderStateContent);
            orderStateMap.put("fontColor", "#666666");
            order.setOrderState(orderStateMap);