admin
2025-02-25 30d8e227e8d823b6c38c3b9c90ac2df03b63befe
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1181,16 +1181,13 @@
                    cog.getGoodsType());
            if (commonGoodsList.size() <= 0)// 不存在就插入商品
            {
                JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId()+"");
                if (goods == null) {
                    goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
                }
                JDGoods goods = null;
                if (goods == null) {
                    goods = new JDGoods();
                    goods.setSkuName(itemOrder.getSkuName());
                    goods.setPrice(itemOrder.getPrice());
                    goods.setSkuId(itemOrder.getSkuId());
                    goods.setItemId(itemOrder.getItemId());
                }
                if (goods != null) {
@@ -1201,7 +1198,20 @@
                cog.setUpdateTime(new Date());
                commonOrderGoodsMapper.insertSelective(cog);
            } else {
                for (CommonOrderGoods orderGoods : commonGoodsList) {
                    if (StringUtil.isNullOrEmpty(orderGoods.getGoodsId())) {
                        JDGoods goods = new JDGoods();
                        goods.setSkuName(itemOrder.getSkuName());
                        goods.setPrice(itemOrder.getPrice());
                        goods.setSkuId(itemOrder.getSkuId());
                        goods.setItemId(itemOrder.getItemId());
                        if (goods != null) {
                            cog = CommonOrderGoodsFactory.create(goods);
                            cog.setId(orderGoods.getId());
                            commonOrderGoodsMapper.updateByPrimaryKeySelective(cog);
                        }
                    }
                }
            }
            newCommonOrder.setUserInfo(new UserInfo(uid));
            commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -1331,38 +1341,38 @@
    public List<CommonOrderAddResultDTO> addDYOrder(DYOrder order, Long uid) throws CommonOrderException {
        List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
            CommonOrder newCommonOrder = CommonOrderFactory.create(order);
            CommonOrderGoods cog = new CommonOrderGoods();
            cog.setGoodsId(order.getProduct_id());
            cog.setGoodsType(Constant.SOURCE_TYPE_DY);
            newCommonOrder.setCommonOrderGoods(cog);
            newCommonOrder.setStateWholeOrder(newCommonOrder.getState());
            // 订单商品插入
            List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
                    cog.getGoodsType());
            if (commonGoodsList.size() <= 0)// 不存在就插入商品
            {
                DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(order.getProduct_id()));
                if (goods == null) {
                    goods = new DYGoodsDetail();
                    goods.setTitle(order.getProduct_name());
                    goods.setPrice(0);
                    goods.setProduct_id(Long.parseLong(order.getProduct_id()));
                    goods.setCover(order.getProduct_img());
                }
                if (goods != null) {
                    cog = CommonOrderGoodsFactory.create(goods);
                }
                cog.setCreateTime(new Date());
                cog.setUpdateTime(new Date());
                commonOrderGoodsMapper.insertSelective(cog);
            } else {
        CommonOrder newCommonOrder = CommonOrderFactory.create(order);
        CommonOrderGoods cog = new CommonOrderGoods();
        cog.setGoodsId(order.getProduct_id());
        cog.setGoodsType(Constant.SOURCE_TYPE_DY);
        newCommonOrder.setCommonOrderGoods(cog);
        newCommonOrder.setStateWholeOrder(newCommonOrder.getState());
        // 订单商品插入
        List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
                cog.getGoodsType());
        if (commonGoodsList.size() <= 0)// 不存在就插入商品
        {
            DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(order.getProduct_id()));
            if (goods == null) {
                goods = new DYGoodsDetail();
                goods.setTitle(order.getProduct_name());
                goods.setPrice(0);
                goods.setProduct_id(Long.parseLong(order.getProduct_id()));
                goods.setCover(order.getProduct_img());
            }
            newCommonOrder.setUserInfo(new UserInfo(uid));
            commonOrderList.add(addCommonOrder(newCommonOrder));
            if (goods != null) {
                cog = CommonOrderGoodsFactory.create(goods);
            }
            cog.setCreateTime(new Date());
            cog.setUpdateTime(new Date());
            commonOrderGoodsMapper.insertSelective(cog);
        } else {
        }
        newCommonOrder.setUserInfo(new UserInfo(uid));
        commonOrderList.add(addCommonOrder(newCommonOrder));
        addConfirmMQMsg(commonOrderList);
        return commonOrderList;
@@ -1956,12 +1966,12 @@
    @Override
    public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
        if(uid!=null) {
        if (uid != null) {
            return commonOrderMapper.getByOrderNo(uid, orderNO);
        }else{
            CommonOrderMapper.DaoQuery daoQuery=new CommonOrderMapper.DaoQuery();
        } else {
            CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery();
            daoQuery.orderId = orderNO;
            return  commonOrderMapper.list(daoQuery,0,100);
            return commonOrderMapper.list(daoQuery, 0, 100);
        }
    }
@@ -2527,14 +2537,14 @@
    }
    @Override
    public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime,int page,int pageSize) {
    public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime, int page, int pageSize) {
        CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery();
        daoQuery.minThirdCreateTime = minThirdCreateTime;
        daoQuery.maxThirdCreateTime = maxThirdCreateTime;
        daoQuery.state = CommonOrder.STATE_FK;
        daoQuery.sourceType = sourceType;
        daoQuery.sortList = Arrays.asList(new String[]{"co_third_create_time ASC"});
        return commonOrderMapper.list(daoQuery, (page-1)*pageSize, pageSize);
        return commonOrderMapper.list(daoQuery, (page - 1) * pageSize, pageSize);
    }
}