remove code

alexyang
1 parent 33a755cd
Showing 8 changed files with 20 additions and 81 deletions
titan-sdk/src/main/java/com/diligrp/titan/sdk/input/ProductInfoParamInput.java
titan-sdk/src/main/java/com/diligrp/titan/sdk/service/ProductService.java
titan-sdk/src/main/java/com/diligrp/titan/sdk/service/impl/ProductServiceImpl.java
titan-sdk/src/test/java/com/diligrp/titan/sdk/TestProductService.java
titan-web/pom.xml
titan-web/src/main/java/com/dili/titan/domain/ProductPop.java
titan-web/src/main/java/com/dili/titan/web/controller/ProductPopController.java
titan-web/src/main/resources/sqlmap/ProductSkuPop.xml
@@ -13,18 +13,11 @@ import java.util.List;
 public class ProductInfoParamInput {
 	 private List<Long> pids;
-	 private String[] defindResult;
 	public List<Long> getPids() {
 		return pids;
 	}
 	public void setPids(List<Long> pids) {
 		this.pids = pids;
 	}
-	public String[] getDefindResult() {
-		return defindResult;
-	}
-	public void setDefindResult(String[] defindResult) {
-		this.defindResult = defindResult;
-	}
-	 
+
 }
 package com.diligrp.titan.sdk.service;
-import com.diligrp.titan.sdk.constant.TopTypeEnum;
 import com.diligrp.titan.sdk.domain.Product;
-import com.diligrp.titan.sdk.domain.ProductSearchSort;
 import com.diligrp.titan.sdk.input.PopProductSearchInput;
 import com.diligrp.titan.sdk.input.PopProductView;
-import com.diligrp.titan.sdk.input.ProductPriceInput;
 import com.diligrp.titan.sdk.input.UpdateProductInput;
 import com.diligrp.titan.sdk.output.BaseOutput;
 import com.diligrp.titan.sdk.output.PageOutput;
@@ -30,12 +27,11 @@ public interface ProductService {
 	/**
 	 * this method is 查询商品的信息,支持批量查询
 	 * @param pids   PIDS 列表
-	 * @param defindResult(attribute、cate、auth、video、subCates)  查询商品所需要的信息列表
 	 * @return
 	 * @createTime 2015年4月24日 下午5:09:04
 	 * @author yangjianjun
 	 */
-	BaseOutput<List<Product>> getProductInfo(List<Long> pids, String[] defindResult);
+	BaseOutput<List<Product>> getProductInfo(List<Long> pids);
 	/**
 	 * 批量查询SKU的详情，
 package com.diligrp.titan.sdk.service.impl;
 import com.alibaba.fastjson.TypeReference;
-import com.diligrp.titan.sdk.constant.TopTypeEnum;
 import com.diligrp.titan.sdk.domain.Product;
-import com.diligrp.titan.sdk.domain.ProductSearchSort;
-import com.diligrp.titan.sdk.input.*;
+import com.diligrp.titan.sdk.input.PopProductSearchInput;
+import com.diligrp.titan.sdk.input.PopProductView;
+import com.diligrp.titan.sdk.input.ProductInfoParamInput;
+import com.diligrp.titan.sdk.input.UpdateProductInput;
 import com.diligrp.titan.sdk.output.BaseOutput;
 import com.diligrp.titan.sdk.output.PageOutput;
 import com.diligrp.titan.sdk.service.ProductService;
@@ -35,11 +36,10 @@ public class ProductServiceImpl extends ServiceExcutor implements ProductService
 	}
 	@Override
-	public BaseOutput<List<Product>> getProductInfo(List<Long> pids, String[] defindResult) {
+	public BaseOutput<List<Product>> getProductInfo(List<Long> pids) {
 		BaseOutput<List<Product>> output = new BaseOutput<List<Product>>();
 		ProductInfoParamInput productInfoInput=new ProductInfoParamInput();
 		productInfoInput.setPids(pids);
-		productInfoInput.setDefindResult(defindResult);
 		output = execute("/product/getProductInfo", productInfoInput, output, new TypeReference<BaseOutput<List<Product>>>() {
 		});
 		return output;
@@ -83,7 +83,7 @@ public class TestProductService {
     public void getProductInfo() {
         List<Long> pids = new ArrayList<Long>();
         pids.add(1000000018L);
-        BaseOutput<List<Product>> base = client.getProductService().getProductInfo(pids, null);
+        BaseOutput<List<Product>> base = client.getProductService().getProductInfo(pids);
         System.out.println(base);
     }
@@ -90,9 +90,9 @@
     <dependencies>
         <dependency>
-            <groupId>com.yqyw.titan</groupId>
+            <groupId>com.b2c.titan</groupId>
             <artifactId>titan-sdk</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>log4j</artifactId>
@@ -537,7 +537,7 @@ public class ProductPop extends BaseDomain {
     }
     public void setSkuList(List<ProductSkuPop> skuList) {
-        if (this.quotationType == QUOTATION_TYPE_GG && CollectionUtils
+        if (CollectionUtils
                 .isNotEmpty(skuList)) {
             Integer minPrice = null;
             Integer maxPrice = null;
@@ -6,7 +6,6 @@ package com.dili.titan.web.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.dili.titan.common.ProductStatus;
 import com.dili.titan.common.log.LogHelper;
 import com.dili.titan.common.log.LogTypeEnum;
 import com.dili.titan.common.utils.SkuUtil;
@@ -17,7 +16,6 @@ import com.dili.titan.domain.Category;
 import com.dili.titan.domain.ProductPop;
 import com.dili.titan.domain.ProductPopQuery;
 import com.dili.titan.domain.base.Result;
-import com.dili.titan.domain.common.Message;
 import com.dili.titan.domain.common.Page;
 import com.dili.titan.rpc.ImageRPC;
 import com.dili.titan.service.AttributeValueService;
@@ -29,7 +27,6 @@ import com.diligrp.manage.sdk.session.SessionContext;
 import com.diligrp.titan.sdk.TitanClient;
 import com.diligrp.titan.sdk.domain.Product;
 import com.diligrp.titan.sdk.domain.Sku;
-import com.diligrp.titan.sdk.input.DefindResult;
 import com.diligrp.titan.sdk.output.BaseOutput;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -213,7 +210,7 @@ public class ProductPopController extends BaseController {
             Product productPop = null;//productPopService.selectEntry(id);
             List<Long> list=new ArrayList<Long>();
             list.add(id);
-            BaseOutput<List<Product>> rest = titanClient.getProductService().getProductInfo(list,new String[]{DefindResult.ATTRIBUTE,DefindResult.AUTH,DefindResult.CATE,DefindResult.FEEDBACK,DefindResult.SUB_CATES,DefindResult.VIEDEO});
+            BaseOutput<List<Product>> rest = titanClient.getProductService().getProductInfo(list);
             List<Product> productPopDetails = rest.getData();
             //productRestService.get
             if(CollectionUtils.isNotEmpty(productPopDetails)){
@@ -278,50 +275,7 @@ public class ProductPopController extends BaseController {
 //        return msg;
 //	}
-	/**
-	 * 审核商品
-	 * @param productPopAudit
-	 * @throws Exception
-	 * @createTime 2014年6月7日 下午2:50:04
-	 * @author celine
-	 */
-	@RequestMapping(value = "/audit")
-	@ResponseBody
-	public Message audit(@RequestBody ProductPopAudit productPopAudit) throws Exception {
-        long start = System.currentTimeMillis();
-		Message msg = null;
-		try {
-            ProductPop productPop = productPopService.selectEntry(productPopAudit.getPid());
-            if(!qxValidate(productPop)){
-                msg = Message.failure("没有权限！请联系管理员！");
-                return msg;
-            }
-			int res = productPopService.audit(productPopAudit);
-			msg = res > 0 ? Message.success() : Message.failure();
-			if(res > 0){
-	    		//待办事项
-				ProductPopQuery query = new ProductPopQuery();
-				query.setStatus(1);
-				query.setManualAuditType(ProductPop.MANUAL_TYPE_NO);
-				int count = productPopService.getProductPopCount(query);if(productPopAudit.getStatus()== ProductStatus.PRODUCT_DENIED) {
-                }
-			}else{
-				msg.setResult("审核第三方商品失败！");
-				return msg;
-			}
-		} catch (Exception e) {
-            LogHelper.error(LogTypeEnum.PRODUCT_POP,e,"失败:" + e.getMessage(), e);
-			msg = Message.failure();
-            LogHelper.error(LogTypeEnum.PRODUCT_POP,e,"审核第三方商品异常！!参数={},操作人账号={},耗时：{}",
-                    productPopAudit.toString(),PassportService.getCurrentUserName(),System.currentTimeMillis() - start);
-		}
-        LogHelper.info(LogTypeEnum.PRODUCT_POP,"审核第三方商品成功！!参数={},操作人账号={},耗时：{}",
-                productPopAudit.toString(),PassportService.getCurrentUserName(),System.currentTimeMillis() - start);
-
-		return msg;
-	}
-	
 	/**
 	 * 批量审核商品
 	 * @throws Exception
@@ -5,7 +5,7 @@
 	<!-- product_pop_sku 所有查询列 -->
 	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[id,sku,title,price,store,store_unit AS storeUnit, mini_purchase AS miniPurchase,pid,
+		<![CDATA[id,sku,title,price,store_unit AS storeUnit,pid,
 		sales, status, version, ctime]]>
 	</sql>
@@ -19,9 +19,7 @@
 			<if test="sku != null and sku != ''"><![CDATA[AND sku = #{sku}]]></if>
 			<if test="title != null and title != ''"><![CDATA[AND title = #{title}]]></if>
 			<if test="price != null and price != ''"><![CDATA[AND price = #{price}]]></if>
-			<if test="store != null and store != ''"><![CDATA[AND store = #{store}]]></if>
 			<if test="storeUnit != null and storeUnit != ''"><![CDATA[AND store_unit = #{storeUnit}]]></if>
-			<if test="miniPurchase != null and miniPurchase != ''"><![CDATA[AND mini_purchase = #{miniPurchase}]]></if>
 			<if test="pid != null and pid != ''"><![CDATA[AND pid = #{pid}]]></if>
 			<if test="sales != null and sales != ''"><![CDATA[AND sales = #{sales}]]></if>
 			<if test="status != null and status != ''"><![CDATA[AND status = #{status}]]></if>
@@ -42,9 +40,7 @@
 			<if test="sku != null"><![CDATA[sku = #{sku},]]></if>
 			<if test="title != null"><![CDATA[title = #{title},]]></if>
 			<if test="price != null"><![CDATA[price = #{price},]]></if>
-			<if test="store != null"><![CDATA[store = #{store},]]></if>
 			<if test="storeUnit != null"><![CDATA[store_unit = #{storeUnit},]]></if>
-			<if test="miniPurchase != null"><![CDATA[mini_purchase = #{miniPurchase},]]></if>
 			<if test="pid != null"><![CDATA[pid = #{pid},]]></if>
 			<if test="sales != null"><![CDATA[sales = #{sales},]]></if>
 			<if test="status != null"><![CDATA[status = #{status},]]></if>
@@ -93,7 +89,7 @@
 	<!-- 其它SQL语句 -->
 	<select id="findBySkuList" parameterType="java.util.List" resultType="productSkuPop">
-		SELECT id,sku,title,price,store,store_unit AS storeUnit, mini_purchase AS miniPurchase,pid,
+		SELECT id,sku,title,price,store_unit AS storeUnit, pid,
 		sales, status, version, ctime
 		FROM
 		product_pop_sku
@@ -104,7 +100,7 @@
 	</select>
 	<select id="findBySkuListWithVersion" parameterType="java.util.List" resultType="productSkuPop">
-		SELECT id,sku,title,price,store,store_unit AS storeUnit, mini_purchase AS miniPurchase,pid,
+		SELECT id,sku,title,price,store_unit AS storeUnit,pid,
 		sales, status, version, ctime
 		FROM
 		product_pop_sku
@@ -121,8 +117,8 @@
 	<update id="updatePopSku" parameterType="java.util.Map">
 		<![CDATA[UPDATE product_pop_sku]]>
 		SET
-		title = #{sku.title},price = #{sku.price},store = #{sku.store},store_unit = #{sku.storeUnit},
-		mini_purchase = #{sku.miniPurchase}, version = version + 1, utime= now()
+		title = #{sku.title},price = #{sku.price},store_unit = #{sku.storeUnit},
+		version = version + 1, utime= now()
 		<![CDATA[WHERE sku = #{sku.sku} AND version = #{version}]]>
 	</update>
@@ -145,10 +141,10 @@
 	<!-- 插入product_pop_sku记录，使用自增id -->
 	<insert id="insertEntry" parameterType="productSkuPop" >
 		<![CDATA[
-			INSERT INTO product_pop_sku (sku,title,price,store,store_unit, mini_purchase, pid,
+			INSERT INTO product_pop_sku (sku,title,price,store_unit, pid,
 		sales, status, version, ctime, utime)
-			VALUES (#{sku},#{title},#{price},#{store},#{storeUnit},
-			#{miniPurchase},#{pid},#{sales},#{status},#{version},now(), now())
+			VALUES (#{sku},#{title},#{price},#{storeUnit},
+			#{pid},#{sales},#{status},#{version},now(), now())
 		]]>
 	</insert>
 </mapper>
 \ No newline at end of file