Merge branch 'master' of http://code.diaosaas.com/zhengfg/zion

 Conflicts:
	src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfCouponEntity.java
	src/main/java/com/diaoyun/zion/chinafrica/service/TbCfIssueCouponService.java
	src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfIssueCouponServiceImpl.java
	src/main/resources/mapper/TbCfCouponDao.xml

src/main/java/com/diaoyun/zion/ZionApplication.java

 package com.diaoyun.zion;
 
-import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @EnableCaching
@@ -19,9 +19,7 @@ public class ZionApplication  extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(ZionApplication.class, args);
     }
-    @Test
-    public void test() throws  Exception{
-    }
+
 
 
 }

src/main/java/com/diaoyun/zion/chinafrica/bis/impl/ZaraSpider.java

@@ -7,6 +7,8 @@ import com.diaoyun.zion.master.util.HttpClientUtil;
 import com.diaoyun.zion.master.util.JsoupUtil;
 import com.diaoyun.zion.master.util.SpiderUtil;
 import com.diaoyun.zion.master.util.TranslateHelper;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
@@ -36,7 +38,7 @@ public class ZaraSpider implements IItemSpider {
 
     /**
      * Massimo Dutti 数据爬虫
-     * @see com.diaoyun.zion.chinafrica.service.impl.SpiderServiceImpl#judgeUrlType 修改商品详情页路径
+     * @see com.diaoyun.zion.chinafrica.service.impl.SpiderServiceImpl# 修改商品详情页路径
      * @see JsoupUtil#getZaraJsonData 返回截取到的主要商品数据
      * @see SpiderUtil#formatZaraProductResponse 格式化数据方法
      * @param targetUrl 接收的商品详情路径
@@ -53,4 +55,17 @@ public class ZaraSpider implements IItemSpider {
         return resultObj;
     }
 
+    public static void main(String[] args) throws Exception {
+        String targetUrl = "https://www.nike.com/cn/t/air-max-90-betrue-%E7%94%B7%E5%AD%90%E8%BF%90%E5%8A%A8%E9%9E%8B-dgC1X4/CJ5482-100";
+        String content = HttpClientUtil.getContentByUrl(targetUrl, PlatformEnum.NIKE.getValue());
+        JSONObject detail = JsoupUtil.getItemDetailByName(content, "window.INITIAL_REDUX_STATE");
+        System.err.println(detail);
+        JSONObject object = detail.getJSONObject("Threads").getJSONObject("products").getJSONObject("CJ5482-100");
+        String fullPrice = object.getString("fullPrice");
+        String currentPrice = object.getString("currentPrice");
+        System.out.println(fullPrice);
+        System.out.println(currentPrice);
+
+    }
+
 }

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java

@@ -9,6 +9,7 @@ import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
 import com.diaoyun.zion.chinafrica.vo.UserCouponVo;
 import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.common.RedisCache;
+import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -57,6 +58,11 @@ public class TbCfCouponController {
     public Result<CouponItem> queryCouponByUserId(@ApiParam("用户Id")@PathVariable("userId") String userId) {
         return tbCfIssueCouponService.queryCouponByUserId(userId);
     }
+    @ApiOperation("更改优惠券状态")
+    @GetMapping("/changCouponStatus/{userId}/{couponId}")
+    public Result changCouponStatus(@ApiParam("用户Id")@PathVariable("userId") String userId,@ApiParam("优惠券Id")@PathVariable("couponId") String couponId){
+        return tbCfIssueCouponService.changeCouponStatus(userId,couponId);
+    }
 
 
 

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfIssueCouponDao.java

@@ -15,4 +15,5 @@ import java.util.List;
 public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
 
     List<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId);
+    int changeCouponStatus(String userId,String couponId);
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfIssueCouponEntity.java

@@ -42,6 +42,8 @@ public class TbCfIssueCouponEntity implements Serializable {
      */
     private String issueId;
 
+
+
     /**
      * 设置：发放表id
      */

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfIssueCouponEntityExtends.java

@@ -11,7 +11,15 @@ public class TbCfIssueCouponEntityExtends extends TbCfIssueCouponEntity {
     private String  start;
     private String  end;
 
+    private Integer status;
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 
     public void setStart(Date start) {
         SimpleDateFormat format=new SimpleDateFormat("yyyy/MM/dd");

src/main/java/com/diaoyun/zion/chinafrica/vo/UserCouponVo.java

@@ -48,7 +48,6 @@ public class UserCouponVo {
         return expiredCouponList;
     }
 
-    public void setExpiredCouponList(List<TbCfCouponEntity> expiredCouponList) {
-        this.expiredCouponList = expiredCouponList;
+    public void setExpiredCouponList(List<TbCfCouponEntity> expiredCouponList) {this.expiredCouponList = expiredCouponList;
     }
 }

src/main/resources/mapper/TbCfIssueCouponDao.xml

@@ -58,26 +58,51 @@
             limit #{offset}, #{limit}
         </if>
     </select>
+    <!--查询用户有效的优惠券-->
     <select id="queryCouponByUserId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends">
-	select
-		a.coupon_issuetable_id,
-		a.coupon_id,
-		b.coupon_category_id,
-		c.coupon_category_name,
-		b.coupon_title,
-		b.with_amount amount,
-		b.deduct_amount money,
-		b.valid_start_time start,
-		b.valid_end_time end,
-		a.user_id,
-		a.nick,
-		a.create_time,
-		a.enable_flag,
-		a.issue_id
-		from tb_cf_issue_coupon a LEFT  join  tb_cf_coupon b ON a.coupon_id=b.coupon_id
-		LEFT JOIN tb_cf_coupon_category c on b.coupon_category_id=c.coupon_category_id
-		WHERE a.user_id = #{user_id} and b.status=1
-</select>
+            select
+            a.coupon_issuetable_id,
+            a.coupon_id,
+            b.coupon_category_id,
+            c.coupon_category_name,
+            b.coupon_title,
+            b.with_amount amount,
+            b.deduct_amount money,
+            b.valid_start_time start,
+            b.valid_end_time end,
+            a.enable_flag status,
+            a.user_id,
+            a.nick,
+            a.create_time,
+            a.enable_flag,
+            a.issue_id
+            from tb_cf_issue_coupon a LEFT  join  tb_cf_coupon b ON a.coupon_id=b.coupon_id
+            LEFT JOIN tb_cf_coupon_category c on b.coupon_category_id=c.coupon_category_id
+            WHERE a.user_id = #{user_id} and a.enable_flag=1 and b.status=1
+    </select>
+
+    <!--查询用户已使用的优惠券-->
+    <select id="queryCouponByUserIdAndUsed" resultType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends">
+            select
+            a.coupon_issuetable_id,
+            a.coupon_id,
+            b.coupon_category_id,
+            c.coupon_category_name,
+            b.coupon_title,
+            b.with_amount amount,
+            b.deduct_amount money,
+            b.valid_start_time start,
+            b.valid_end_time end,
+            a.enable_flag status,
+            a.user_id,
+            a.nick,
+            a.create_time,
+            a.enable_flag,
+            a.issue_id
+            from tb_cf_issue_coupon a LEFT  join  tb_cf_coupon b ON a.coupon_id=b.coupon_id
+            LEFT JOIN tb_cf_coupon_category c on b.coupon_category_id=c.coupon_category_id
+            WHERE a.user_id = #{user_id} and a.enable_flag=0 or b.status=0
+    </select>
     <select id="queryTotal" resultType="int">
         select count(*) from tb_cf_issue_coupon
         WHERE 1=1
@@ -86,7 +111,7 @@
         </if>
     </select>
 
-    <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
+ <!--   <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
 		insert into tb_cf_issue_coupon(
 			`coupon_issuetable_id`,
 			`coupon_id`,
@@ -103,7 +128,7 @@
 			#{createTime},
 			#{enableFlag},
 			#{issueId})
-	</insert>
+	</insert>-->
 
     <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
         update tb_cf_issue_coupon
@@ -117,7 +142,13 @@
         </set>
         where coupon_issuetable_id = #{couponIssuetableId}
     </update>
-
+    <update id="changeCouponStatus" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
+        UPDATE tb_cf_issue_coupon
+        SET enable_flag = 0
+        WHERE
+	    user_id = #{userId}
+	    AND coupon_id = #{couponId}
+    </update>
     <delete id="delete">
 		delete from tb_cf_issue_coupon where coupon_issuetable_id = #{value}
 	</delete>

src/test/java/com/diaoyun/zion/ZionApplicationTests.java

 package com.diaoyun.zion;
 
 import com.diaoyun.zion.chinafrica.constant.KeyConstant;
-import com.diaoyun.zion.chinafrica.enums.PlatformEnum;
 import com.diaoyun.zion.chinafrica.service.SpiderService;
 import com.diaoyun.zion.chinafrica.service.TbCfCouponService;
-import com.diaoyun.zion.chinafrica.service.impl.TbCfOrderServiceImpl;
 import com.diaoyun.zion.master.thread.TaskLimitSemaphore;
-import com.diaoyun.zion.master.util.*;
-import com.google.gson.Gson;
+import com.diaoyun.zion.master.util.AESUtils;
+import com.diaoyun.zion.master.util.IdUtil;
 import com.stripe.exception.StripeException;
 import freemarker.template.Configuration;
-import org.apache.http.*;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.CookieStore;
 import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
@@ -20,15 +18,14 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -438,4 +435,15 @@ public class ZionApplicationTests {
      String a =  AESUtils.encrypt(KeyConstant.AES_KEY,"sk_live_YbAVymUjl4ZEVGfzeyHyRTKM00JviD18nI");
         System.out.println(a);
     }
+
+    @Test
+    public  void test(){
+        redisTemplate.opsForValue().set("hello","helloworld");
+        Object hello = redisTemplate.opsForValue().get("hello");
+        System.out.println(hello);
+        redisTemplate.delete("hello");
+        System.out.println("==============="+redisTemplate.opsForValue().get("hello"));
+
+    }
+
 }