感恩活动开发

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java

@@ -35,6 +35,8 @@ public class CouponItemDto implements java.io.Serializable{
 	private Date endDate;						//结束时间
 	private String couponItemRemark;			//优惠券详情备注
 	private PageBean page;						//分页
+
+	private Exchange exchange;	//
 	
 	public String getCouponItemId() {
 		return couponItemId;
@@ -126,7 +128,12 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setCouponType(Integer couponType) {
 		this.couponType = couponType;
 	}
-	
-	
-	
+
+	public Exchange getExchange() {
+		return exchange;
+	}
+
+	public void setExchange(Exchange exchange) {
+		this.exchange = exchange;
+	}
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/Exchange.java

@@ -13,6 +13,10 @@ public class Exchange  implements  Serializable{
     private Integer exchangeId;
     //
     private Integer couponId;
+    //名称
+    private String exchangeName;
+    //名称
+    private String exchangeDesc;
     //创建时间
     private Date exchangeCreateTime;
     //修改时间'
@@ -49,4 +53,20 @@ public class Exchange  implements  Serializable{
     public void setExchangeUpdateTime(Date  exchangeUpdateTime){
         this.exchangeUpdateTime=exchangeUpdateTime;
     }
+
+    public String getExchangeName() {
+        return exchangeName;
+    }
+
+    public void setExchangeName(String exchangeName) {
+        this.exchangeName = exchangeName;
+    }
+
+    public String getExchangeDesc() {
+        return exchangeDesc;
+    }
+
+    public void setExchangeDesc(String exchangeDesc) {
+        this.exchangeDesc = exchangeDesc;
+    }
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/exchangeMapper.xml

@@ -10,6 +10,8 @@
     <sql    id="Base_List" >
         t.exchange_id,
         t.coupon_id,
+        t.exchange_name,
+        t.exchange_desc,
         t.exchange_create_time,
         t.exchange_update_time
     </sql>
@@ -36,11 +38,15 @@
         insert into
         tb_iamberry_coupon_exchange
         (
-        coupon_id
+        coupon_id,
+        exchange_name,
+        exchange_desc
         )
         values
         (
-        #{couponId}
+        #{couponId},
+        #{exchangeName},
+        #{exchangeDesc}
         )
     </insert>
     <update id="update" parameterType="Exchange" >

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -51,6 +51,8 @@ public class CouponTypeHandler {
 	private MemberService memberService;
 	@Autowired
 	private SystemService systemService;
+	@Autowired
+	private ExchangeService exchangeService;
 
 	private static Logger logger = LoggerFactory.getLogger(CouponTypeHandler.class);
 	/**
@@ -328,6 +330,14 @@ public class CouponTypeHandler {
 					&& itemDto.getCouponUseEndDate().before(now)) {
 				itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_PASSED);
 			}
+			if(itemDto.getCouponType().equals(3)){
+				Exchange exchange = new Exchange();
+				exchange.setCouponId(itemDto.getCouponId());
+				List<Exchange> exchangeList = exchangeService.getExchangeList(exchange);
+				if(exchangeList != null && exchangeList.size() > 0){
+					itemDto.setExchange(exchangeList.get(0));
+				}
+			}
 		}
 		rm = new ResultMsg(true, ResultMsg.SUCCESS, "查询成功!",null);
 		map.put("itemList", list);

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/thanksgiving/ThanksGivingHandler.java

@@ -184,9 +184,13 @@ public class ThanksGivingHandler {
         ThanksGiving thanksGiving = new ThanksGiving();
         thanksGiving.setThanksGivingPhone(phone);
         List<ThanksGiving> thanksGivingList = thanksGivingService.getThanksGivingList(thanksGiving);
-        if(thanksGivingList == null || thanksGivingList.size() < 1){
+        if(thanksGivingList == null){
             return new ResultMsg(false, ResultMsg.ERROR, "该电话号码不能领取!",null);
         }
+        thanksGiving = thanksGivingList.get(0);
+        if(thanksGiving.getThanksGivingStatus() != 1 ){
+            return new ResultMsg(false, ResultMsg.ERROR, "领取失败，该电话号码已领取优惠券!",null);
+        }
 
         ThanksGiving tg = new ThanksGiving();
         tg.setThanksGivingPhone(phone);