123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityRule.java

@@ -34,6 +34,14 @@ public class ActivityRule implements Serializable {
 	@ApiModelProperty(value = "活动名称")
     private String name;
 
+	/**
+	 *  活动名称
+	 */
+	@Column(name = "img")
+	@ApiModelProperty(value = "活动名称")
+	private String img;
+
+
 	/**
      *  活动描述
      */

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Coupon.java

@@ -38,6 +38,10 @@ public class Coupon implements Serializable {
 	@ApiModelProperty(value = "优惠券标题（有图片则显示图片）：无门槛50元优惠券 | 单品最高减2000元")
     private String title;
 
+	@Column(name = "subtitle")
+	@ApiModelProperty(value = "副标题")
+	private String subtitle;
+
 	    /**
      *  图片
      */

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityRuleVo.java

+package com.xxfc.platform.activity.vo;
+
+import com.xxfc.platform.activity.entity.Coupon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 通用活动规则表
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-16 14:04:22
+ */
+@Data
+public class ActivityRuleVo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  活动名称
+     */
+	@ApiModelProperty(value = "活动名称")
+    private String name;
+
+	/**
+	 *  活动名称
+	 */
+	@ApiModelProperty(value = "活动名称")
+	private String img;
+
+
+	/**
+     *  活动描述
+     */
+	@ApiModelProperty(value = "活动描述")
+    private String descr;
+	
+	    /**
+     *  活动人数限制
+     */
+	@ApiModelProperty(value = "活动人数限制")
+    private Integer number;
+	
+	    /**
+     *  参加活动人数
+     */
+	@ApiModelProperty(value = "参加活动人数")
+    private Integer joinNumber;
+	
+	    /**
+     *  活动是否开启：0-未开启；1-已开启;2-已关闭
+     */
+	@ApiModelProperty(value = "活动是否开启：0-未开启；1-已开启;2-已关闭")
+    private Integer status;
+	
+	    /**
+     *  活动奖励规则,json数组格式 [{"type":1, "detail":{...}},...] //// type分类 1--现金；
+     */
+	@ApiModelProperty(value = "活动奖励规则,json数组格式 [{type:1, detail:{...}},...] //// type分类 1--现金；")
+    private String value;
+	
+	    /**
+     *  创建时间
+     */
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除：0-正常；1-删除
+     */
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+
+	@ApiModelProperty(value = "优惠卷列表")
+	List<Coupon> coupons;
+	
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java

 package com.xxfc.platform.activity.biz;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.vo.ActivityRuleVo;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.ActivityRule;
@@ -7,6 +15,7 @@ import com.xxfc.platform.activity.mapper.ActivityRuleMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,15 +29,54 @@ import java.util.List;
 public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
 
 
+    @Autowired
+    CouponBiz couponBiz;
+
+
      //获取最新的生效的活动
     public  ActivityRule getActity(){
         Example example=new Example(ActivityRule.class);
         example.createCriteria().andEqualTo("status",1).andEqualTo("isDel",0);
-        example.orderBy("id desc");
+        example.setOrderByClause("id desc");
         List<ActivityRule> list=mapper.selectByExample(example);
         if(list.size()>0){
           return  list.get(0);
         }
         return  null;
     }
+
+    //获取最新活动的H5页面
+    public ObjectRestResponse getActivityH5(){
+        ActivityRule activityRule=getActity();
+        if (activityRule==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"无有效的活动");
+        }
+        ActivityRuleVo ruleVo=new ActivityRuleVo();
+        try {
+            BeanUtils.copyProperties(ruleVo, activityRule);
+            String value=activityRule.getValue();
+            JSONObject json=JSONObject.parseObject(value);
+            if(json!=null){
+                Integer type=json.getInteger("type");
+                if(type==1){
+                    JSONArray array=json.getJSONArray("value");
+                    List<Coupon> coupons=new ArrayList<>();
+                    if(array.size()>0){
+                        for(int i=0;i<array.size();i++){
+                            Integer id=array.getJSONObject(i).getInteger("id");
+                            coupons.add(couponBiz.selectById(id));
+                        }
+                    }
+                    ruleVo.setCoupons(coupons);
+                }
+            }
+            return  ObjectRestResponse.succ(ruleVo);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+
+
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitConfig.java

+package com.xxfc.platform.activity.config;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * rabbitmq配置类
+ * 包含： 不知道什么orderWater队列
+ * @author zhoujw
+ * @date 2019/7/15
+ */
+@Configuration
+public class RabbitConfig {
+
+    public static final String HZ_EXC = "hz_exchange";
+    public static final String INTEGRAL_QUEUE = "integral_queue";
+    public static final String ORDER_WATER_KEY = "order";
+
+//    /**
+//     * 队列交换机
+//     * 注意这里的交换机类型：CustomExchange
+//     * @return
+//     */
+//    @Bean
+//    public DirectExchange directExchange(){
+//        return new DirectExchange(HZ_EXC, true, false);
+//    }
+
+    /**
+     * 队列
+     * @return
+     */
+    @Bean
+    public Queue orderWaterQueue(){
+        return new Queue(INTEGRAL_QUEUE,true);
+    }
+
+//     /**
+//     * 队列绑定交换机
+//     * @return
+//     */
+//    @Bean
+//    public Binding orderWaterBinding(Queue orderWaterQueue, DirectExchange directExchange){
+//        return BindingBuilder.bind(orderWaterQueue).to(directExchange).with(ORDER_WATER_KEY);
+//    }
+
+}
+

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityRuleController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityRuleBiz;
+import com.xxfc.platform.activity.entity.ActivityRule;
+import com.xxfc.platform.activity.entity.ActivityUserJoin;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("rule")
+public class ActivityRuleController extends BaseController<ActivityRuleBiz, ActivityRule> {
+
+    @ApiOperation("新人有礼参加活动")
+    @RequestMapping(value = "/app/unauth/H5", method = RequestMethod.GET)
+    public ObjectRestResponse H5(){ return baseBiz.getActivityH5(); }
+
+}
\ No newline at end of file