yujian
2019-07-29 cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3
订单商品类型处理
3个文件已修改
22 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderGoodsVO.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -839,7 +839,7 @@
        // 京东
        if (goodsType == Constant.SOURCE_TYPE_JD) {
            JSONObject data = new JSONObject();
            data.put("listQuality", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
            data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
        
            List<JDGoods> list = JDUtil.getRecommendGoodsById(id);
            if (list == null) {
@@ -861,7 +861,7 @@
                listDetailVO.remove(listDetailVO.size() - 1);
            }
                        
            data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listDetailVO));
            data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO));
            out.print(JsonUtil.loadTrueResult(data));
            return;
        }
@@ -869,7 +869,7 @@
        // 拼多多
        if (goodsType == Constant.SOURCE_TYPE_PDD) {
            JSONObject data = new JSONObject();
            data.put("listQuality", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
            data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
            
            List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
            
@@ -904,7 +904,7 @@
                listDetailVO.remove(listDetailVO.size() - 1);
            }
            
            data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listDetailVO));
            data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO));
            out.print(JsonUtil.loadTrueResult(data));
            return;
        }
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -269,6 +269,8 @@
                        e.printStackTrace();
                    }
                    commonGoodsVO.setGoodsType(sourceType2);
                    String picture = commonGoodsVO.getPicture();
                    if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
                        commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderGoodsVO.java
@@ -25,6 +25,10 @@
    @Expose
    private String actualPay;
    
    // 商品类型: 淘宝、京东、拼多多
    @Expose
    private Integer goodsType;
    // 商品标题、颜色、背景色
    @Expose
    private Map<String, String> goodsTitle;
@@ -54,4 +58,12 @@
        this.goodsTitle = goodsTitle;
    }
    public Integer getGoodsType() {
        return goodsType;
    }
    public void setGoodsType(Integer goodsType) {
        this.goodsType = goodsType;
    }
}