fanli-server.git

			@@ -141,7 +141,7 @@
			@RequestMapping(value = "getUserOrderList")
			public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType,
			String key, Integer state, Integer type, Integer orderState, String startTime, String endTime,
			Integer source, PrintWriter out) {
			Integer sourceType, PrintWriter out) {

			if (pageIndex == null \|\| pageIndex < 1) {
			pageIndex = 1;
			@@ -163,16 +163,12 @@
			}

			try {
			long count = 0;

			// 查询列表
			List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
			state, type, orderState, startTime, endTime, source);
			state, type, orderState, startTime, endTime, sourceType);

			if (list != null && list.size() > 0) {
			// 统计总数
			count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
			}
			long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, sourceType);

			// 查询是否维权
			for (CommonOrderVO order : list) {

			@@ -104,7 +104,6 @@
			textStyleVO.setContent("京东自营");
			textStyleVO.setColor("#E42219");
			labels.add(textStyleVO);
			goodsInfo.setLabels(labels);
			}
			// 拼团价
			JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
			@@ -117,12 +116,12 @@
			}
			ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
			textStyleVO.setContent("拼购");
			textStyleVO.setColor("#FF9600");
			textStyleVO.setColor("#E42219");
			labels.add(textStyleVO);
			goodsInfo.setLabels(labels);
			} else {
			goodsInfo.setPriceName("京东价");
			}
			goodsInfo.setLabels(labels);
			} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
			goodsInfo.setSalesType(4); // 总销量
			goodsInfo.setPriceName("拼团价");
			@@ -431,6 +430,7 @@
			// 京东自营标签
			String owner = goods.getOwner();
			if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
			goodsInfo.setShopType(21); // 京东自营
			if (labels == null) {
			labels = new ArrayList<ClientTextStyleVO>();
			}
			@@ -438,8 +438,6 @@
			textStyleVO.setContent("京东自营");
			textStyleVO.setColor("#E42219");
			labels.add(textStyleVO);
			goodsInfo.setLabels(labels);
			goodsInfo.setShopType(21); // 京东自营
			} else {
			goodsInfo.setShopType(20); // 京东
			}
			@@ -455,13 +453,13 @@
			}
			ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
			textStyleVO.setContent("拼购");
			textStyleVO.setColor("#FF9600");
			textStyleVO.setColor("#E42219");
			labels.add(textStyleVO);
			goodsInfo.setLabels(labels);
			} else {
			goodsInfo.setZkPrice(goods.getPrice());
			goodsInfo.setPriceName("京东价");
			}
			goodsInfo.setLabels(labels);

			// 店铺信息
			JDShopInfo shopInfo = goods.getShopInfo();

	fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史