普通商品类更新

admin

2018-12-05 369a0ab38717a891cdd42f268a866481c51374ec

普通商品类更新

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -7,8 +7,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -17,12 +15,12 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;

import com.yeshi.fanli.service.inter.push.PushGoodsService;

@@ -32,6 +30,8 @@
import com.yeshi.fanli.util.annotation.RequestNoLogin;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/pushgoods")

public class PushGoodsController {


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java

@@ -7,9 +7,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -19,12 +16,12 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.push.PushGoodsRecord;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;

@@ -33,6 +30,9 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



/**

 * 今日推送

 * 


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -18,10 +18,10 @@
import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.MergeClass;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaobaoMeterial;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;


 fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java

@@ -6,9 +6,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -17,6 +14,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.push.DeviceTokenIOS;

import com.yeshi.fanli.entity.push.PushGoods;

@@ -24,7 +22,6 @@
import com.yeshi.fanli.entity.push.PushGoodsRecord;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.exception.push.PushGoodsGroupException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

@@ -40,6 +37,9 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.JumpDetailParamsFactory;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping(value = "api/v1/push")

public class PushController {


 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -38,12 +38,13 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

import com.yeshi.fanli.entity.bus.user.CollectionGoods;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.ShamUser;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

@@ -59,8 +60,6 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.JumpDetailService;


 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -50,6 +50,7 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

@@ -57,7 +58,6 @@
import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -21,13 +21,13 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.taobao.ScanHistory;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -22,12 +22,12 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CollectionGoodsV2Mapper.java

@@ -4,7 +4,7 @@

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

public interface CollectionGoodsV2Mapper {


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java

@@ -2,7 +2,7 @@

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.CommonGoods;

public interface CommonGoodsMapper {


 fanli/src/main/java/com/yeshi/fanli/entity/goods/CollectionGoodsV2.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/goods/CollectionGoodsV2.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.goods;

package com.yeshi.fanli.entity.goods;



import java.util.Date;




 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/goods/CommonGoods.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.goods;

package com.yeshi.fanli.entity.goods;



import java.math.BigDecimal;

import java.util.Date;


 fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java

@@ -3,7 +3,7 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.CommonGoods;



@Table("yeshi_ec_push_goods_group")

public class PushGoodsGroup {


 fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.goods.CollectionGoodsV2Mapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.goods.CollectionGoodsV2">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.goods.CollectionGoodsV2">
        <id column="cg_id" property="id" jdbcType="BIGINT" />
        <result column="cg_createtime" property="createTime" jdbcType="TIMESTAMP" />
        <result column="cg_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -77,13 +77,13 @@
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_collection_goods_v2 where cg_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.goods.CollectionGoodsV2"
    <insert id="insert" parameterType="com.yeshi.fanli.entity.goods.CollectionGoodsV2"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_collection_goods_v2
        (cg_id,cg_uid,cg_common_goods_id,cg_createtime,cg_updatetime) values
        (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{commonGoods.id,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.goods.CollectionGoodsV2"
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.goods.CollectionGoodsV2"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_collection_goods_v2
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -102,14 +102,14 @@
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.goods.CollectionGoodsV2">update
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.goods.CollectionGoodsV2">update
        yeshi_ec_collection_goods_v2 set cg_uid =
        #{userInfo.id,jdbcType=BIGINT},cg_common_goods_id =
        #{commonGoods.id,jdbcType=BIGINT},cg_createtime =
        #{createTime,jdbcType=TIMESTAMP},cg_updatetime =
        #{updateTime,jdbcType=TIMESTAMP} where cg_id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.goods.CollectionGoodsV2">
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.goods.CollectionGoodsV2">
        update yeshi_ec_collection_goods_v2
        <set>
            <if test="userInfo != null">cg_uid=#{userInfo.id,jdbcType=BIGINT},</if>

 fanli/src/main/java/com/yeshi/fanli/mapping/goods/CommonGoodsMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.goods.CommonGoods">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.goods.CommonGoods">
        <id column="cg_id" property="id" jdbcType="BIGINT" />
        <result column="cg_title" property="title" jdbcType="VARCHAR" />
        <result column="cg_goods_id" property="goodsId" jdbcType="BIGINT" />
@@ -50,13 +50,13 @@
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_common_goods where cg_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.goods.CommonGoods"
    <insert id="insert" parameterType="com.yeshi.fanli.entity.goods.CommonGoods"
        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_common_goods
        (cg_id,cg_title,cg_goods_id,cg_goods_type,cg_shop_type,cg_seller_id,cg_seller_name,cg_sales,cg_rate,cg_picture,cg_state,cg_price,cg_coupon_info,cg_coupon_startprice,cg_coupon_amount,cg_coupon_left_count,cg_coupon_total_count,cg_video_cover,cg_video_url,cg_createtime,cg_updatetime)
        values
        (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{goodsId,jdbcType=BIGINT},#{goodsType,jdbcType=INTEGER},#{shopType,jdbcType=INTEGER},#{sellerId,jdbcType=BIGINT},#{sellerName,jdbcType=VARCHAR},#{sales,jdbcType=INTEGER},#{rate,jdbcType=DECIMAL},#{picture,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{price,jdbcType=DECIMAL},#{couponInfo,jdbcType=VARCHAR},#{couponStartPrice,jdbcType=DECIMAL},#{couponAmount,jdbcType=DECIMAL},#{couponLeftCount,jdbcType=INTEGER},#{couponTotalCount,jdbcType=INTEGER},#{videoCover,jdbcType=VARCHAR},#{videoUrl,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.goods.CommonGoods"
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.goods.CommonGoods"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_common_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -107,7 +107,7 @@
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.goods.CommonGoods">update
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.goods.CommonGoods">update
        yeshi_ec_common_goods set cg_title =
        #{title,jdbcType=VARCHAR},cg_goods_id =
        #{goodsId,jdbcType=BIGINT},cg_goods_type =
@@ -130,7 +130,7 @@
        #{createTime,jdbcType=TIMESTAMP},cg_updatetime =
        #{updateTime,jdbcType=TIMESTAMP} where cg_id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.goods.CommonGoods">
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.goods.CommonGoods">
        update yeshi_ec_common_goods
        <set>
            <if test="title != null">cg_title=#{title,jdbcType=VARCHAR},</if>

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java

@@ -11,11 +11,11 @@
import com.yeshi.fanli.dao.mybatis.goods.CollectionGoodsV2Mapper;

import com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java

@@ -7,8 +7,8 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.util.StringUtil;




 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

@@ -10,12 +10,12 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java

@@ -16,7 +16,6 @@
import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java

@@ -2,9 +2,9 @@


import java.util.List;



import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.goods.CollectionGoodsV2;



public interface CollectionGoodsV2Service {




 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.service.inter.goods;



import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.goods.CommonGoods;



/**

 * 常规商品库


 fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java

@@ -1,9 +1,9 @@
package com.yeshi.fanli.util.factory;



import com.yeshi.fanli.entity.bus.user.CollectionGoods;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



public class CollectionGoodsFactory {


 fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java

@@ -3,9 +3,9 @@
import java.util.Date;



import com.yeshi.fanli.entity.bus.user.CollectionGoods;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



public class CollectionGoodsV2Factory {


 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.util.factory;



import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.goods.CommonGoods;



public class CommonGoodsFactory {




 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -18,9 +18,6 @@
import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.methods.GetMethod;

import org.jsoup.Connection;

@@ -32,6 +29,9 @@
import org.springframework.stereotype.Component;

import org.w3c.dom.NamedNodeMap;

import org.w3c.dom.NodeList;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.user.CollectionGoods;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.ScanHistory;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;

@@ -53,7 +54,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

@@ -62,9 +62,9 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoHttpUtil;

import com.yeshi.fanli.util.TimeUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Component

public class TaoBaoUtil {


 fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java

@@ -2,17 +2,15 @@


import org.json.JSONException;

import org.json.JSONObject;



import com.qcloud.cos.model.COSObjectSummary;

import com.qcloud.cos.model.ObjectListing;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.WeiXinUserParam;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.entity.FileUploadResult;

import org.yeshi.utils.tencentcloud.COSManager;

import org.yeshi.utils.wx.WXUtil;



import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.WeiXinUserParam;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



public class WXLoginUtil {



@@ -124,6 +122,7 @@
    }



    private static WeiXinUserParam getWeiXinUserParam(String result) {

        LogHelper.test(result);

        WeiXinUserParam weiXinUserParam = new WeiXinUserParam();

        JSONObject jsonObject = null;

        try {


 utils/src/main/java/org/yeshi/utils/wx/WXGZMsgUtil.java

New file
@@ -0,0 +1,91 @@
package org.yeshi.utils.wx;



import java.io.File;

import java.util.Map;



import javax.servlet.http.HttpServletRequest;



import org.yeshi.utils.HttpUtil;



import net.sf.json.JSONObject;



//小程序客服消息处理

public class WXGZMsgUtil {

    public final static String TYPE_IMAGE = "image";



    public static JSONObject parseHuiHuaMsg(HttpServletRequest request, String xmlContent, String token,

            String encodingASEKey, String appId) {

        String msgSignature = request.getParameter("msg_signature");

        String timeStamp = request.getParameter("timestamp");

        String nonce = request.getParameter("nonce");

        JSONObject root = new JSONObject();

        Map<String, String> map = WXUtil.parseXML(xmlContent, msgSignature, timeStamp, nonce, token, encodingASEKey,

                appId);



        JSONObject data = new JSONObject();

        data.put("openid", map.get("FromUserName"));

        data.put("ghid", map.get("ToUserName"));

        data.put("sessionFrom", map.get("SessionFrom"));

        root.put("data", data);

        if ("user_enter_tempsession".equalsIgnoreCase(map.get("Event"))) {

            root.put("code", 0);// 进入会话事件

        } else

            root.put("code", 1);// 其他事件

        return root;

    }



    private static boolean sendMsg(String acessToken, JSONObject data) {

        String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=" + acessToken;

        String result = HttpUtil.post(url, data.toString());

        return true;

    }



    public static String uploadFile(String accessToken, String type, File f) {

        String url = String.format("https://api.weixin.qq.com/cgi-bin/media/upload?access_token=%s&type=%s",

                accessToken, type);

        String result = HttpUtil.post(url, "media", f);

        JSONObject resultObject = JSONObject.fromObject(result);

        return resultObject.optString("media_id");

    }



    // 发送文字消息

    public static boolean sendTextMsg(String acessToken, String openId, String text) {



        JSONObject data = new JSONObject();

        data.put("touser", openId);

        data.put("msgtype", "text");

        JSONObject textObject = new JSONObject();

        textObject.put("content", text);

        data.put("text", textObject);

        return sendMsg(acessToken, data);

    }



    // 发送图片消息

    public static boolean sendImageMsg(String acessToken, String openId, String mediaId) {

        JSONObject data = new JSONObject();

        data.put("touser", openId);

        data.put("msgtype", "image");

        JSONObject imageObject = new JSONObject();

        imageObject.put("media_id", mediaId);

        data.put("image", imageObject);

        return sendMsg(acessToken, data);

    }



    // 发送图文消息

    public static boolean sendTextImageMsg(String acessToken, String openId, String title, String desc, String url,

            String thumbUrl) {

        JSONObject data = new JSONObject();

        data.put("touser", openId);

        data.put("msgtype", "link");

        JSONObject linkObject = new JSONObject();

        linkObject.put("title", title);

        linkObject.put("description", desc);

        linkObject.put("url", url);

        linkObject.put("thumb_url", thumbUrl);

        data.put("link", linkObject);

        return sendMsg(acessToken, data);

    }

	
	


}