活动的改版

src/main/java/com/ssj/api/controller/ApiMerchantController.java

@@ -17,7 +17,6 @@ import com.ssj.bean.sys.fx.domain.Merchant;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoinConsume;
 import com.ssj.framework.basic.utils.DateHelper;
 import com.ssj.framework.core.common.controller.BaseController;
-import com.ssj.framework.core.security.manager.TokenManager;
 import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.service.sys.fx.service.MerchantService;
@@ -32,9 +31,6 @@ import io.swagger.annotations.ApiOperation;
 public class ApiMerchantController extends BaseController {
 	
 	@Autowired
-	private TokenManager tokenManager;
-	
-	@Autowired
 	private MerchantService merchantService;
 	
 	@Autowired
@@ -68,7 +64,7 @@ public class ApiMerchantController extends BaseController {
 					consume.setLibService(merchant.getLibService());
 					consume.setPlatformService(0);
 					consume.setType(2);
-					consume.setRemarks("消费【新模式用户激活消费】");
+					consume.setRemarks("消费【新模式用户激活消费】 -来源开放接口");
 					consume.setCreateTime(new Date());
 					libJoinConsumeService.save(consume);
 	        	}

src/main/java/com/ssj/bean/sys/award/domain/AwardActivity.java

@@ -1,220 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import com.alibaba.fastjson.JSONArray;
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import java.util.Date;
-
-
-@Entity
-@Table(name="tb_award_activity")
-public class AwardActivity extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String merchantId;
-	
-	private String title;
-	
-	private Integer portNum;
-	
-	private Integer partakeNum;
-	
-	private String img;
-	
-//	private String level1MaterialId;
-//	
-//	private String level2MaterialId;
-//	
-//	private String level3MaterialId; 
-	
-	private JSONArray level1MaterialIdJson;
-	
-	private JSONArray level2MaterialIdJson;
-	
-	private JSONArray level3MaterialIdJson;
-	
-	private Integer level1Num; 
-	
-	private Integer level2Num;
-
-	private Integer level3Num;
-	
-	private Integer status;
-	
-	private Date createTime;
-	
-	private Date updateTime;
-	
-	private String remarks;
-	
-	private Integer isRedis;
-
-	public String getMerchantId() {
-		return merchantId;
-	}
-
-	public void setMerchantId(String merchantId) {
-		this.merchantId = merchantId;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Integer getPartakeNum() {
-		return partakeNum;
-	}
-
-	public void setPartakeNum(Integer partakeNum) {
-		this.partakeNum = partakeNum;
-	}
-
-//	@Column(name = "level1_material_id")
-//	public String getLevel1MaterialId() {
-//		return level1MaterialId;
-//	}
-//
-//	public void setLevel1MaterialId(String level1MaterialId) {
-//		this.level1MaterialId = level1MaterialId;
-//	}
-//
-//	@Column(name = "level2_material_id")
-//	public String getLevel2MaterialId() {
-//		return level2MaterialId;
-//	}
-//
-//	public void setLevel2MaterialId(String level2MaterialId) {
-//		this.level2MaterialId = level2MaterialId;
-//	}
-//
-//	@Column(name = "level3_material_id")
-//	public String getLevel3MaterialId() {
-//		return level3MaterialId;
-//	}
-//
-//	public void setLevel3MaterialId(String level3MaterialId) {
-//		this.level3MaterialId = level3MaterialId;
-//	}
-
-	@Column(name = "level1_num")
-	public Integer getLevel1Num() {
-		return level1Num;
-	}
-
-	public void setLevel1Num(Integer level1Num) {
-		this.level1Num = level1Num;
-	}
-	
-	@Column(name = "level2_num")
-	public Integer getLevel2Num() {
-		return level2Num;
-	}
-
-	public void setLevel2Num(Integer level2Num) {
-		this.level2Num = level2Num;
-	}
-
-	@Column(name = "level3_num")
-	public Integer getLevel3Num() {
-		return level3Num;
-	}
-
-	public void setLevel3Num(Integer level3Num) {
-		this.level3Num = level3Num;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getPortNum() {
-		return portNum;
-	}
-
-	public void setPortNum(Integer portNum) {
-		this.portNum = portNum;
-	}
-
-	public String getRemarks() {
-		return remarks;
-	}
-
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	public String getImg() {
-		return img;
-	}
-
-	public void setImg(String img) {
-		this.img = img;
-	}
-
-	public Integer getIsRedis() {
-		return isRedis;
-	}
-
-	public void setIsRedis(Integer isRedis) {
-		this.isRedis = isRedis;
-	}
-	
-	@Transient
-	public JSONArray getLevel1MaterialIdJson() {
-		return level1MaterialIdJson;
-	}
-
-	public void setLevel1MaterialIdJson(JSONArray level1MaterialIdJson) {
-		this.level1MaterialIdJson = level1MaterialIdJson;
-	}
-	
-	@Transient
-	public JSONArray getLevel2MaterialIdJson() {
-		return level2MaterialIdJson;
-	}
-
-	public void setLevel2MaterialIdJson(JSONArray level2MaterialIdJson) {
-		this.level2MaterialIdJson = level2MaterialIdJson;
-	}
-	
-	@Transient
-	public JSONArray getLevel3MaterialIdJson() {
-		return level3MaterialIdJson;
-	}
-
-	public void setLevel3MaterialIdJson(JSONArray level3MaterialIdJson) {
-		this.level3MaterialIdJson = level3MaterialIdJson;
-	}
-
-	
-}

src/main/java/com/ssj/bean/sys/award/domain/AwardActivityInfo.java

@@ -1,70 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-
-@Entity
-@Table(name="tb_award_activity_info")
-public class AwardActivityInfo extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String activityId;
-	
-	private String materialId;
-	
-	private Integer level;
-	
-	private Integer num;
-	
-	private Date createTime;
-
-	public String getActivityId() {
-		return activityId;
-	}
-
-	public void setActivityId(String activityId) {
-		this.activityId = activityId;
-	}
-
-	public String getMaterialId() {
-		return materialId;
-	}
-
-	public void setMaterialId(String materialId) {
-		this.materialId = materialId;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	public Integer getNum() {
-		return num;
-	}
-
-	public void setNum(Integer num) {
-		this.num = num;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	
-	
-	
-}

src/main/java/com/ssj/bean/sys/award/domain/AwardActivityLog.java

@@ -13,27 +13,18 @@ public class AwardActivityLog extends BaseEntity {
 	
 	private static final long serialVersionUID = 1L;
 	
-	private String awardActivityId;
+	private String userId;
+	
+	private String vipId;
 	
 	private Integer status;
 	
 	private String snCode;
 	
 	private String awardMaterialId;
-	
-	private String userId;
-	
-	private String vipId;
-	
-	private Date createTime;
 
-	public String getAwardActivityId() {
-		return awardActivityId;
-	}
+	private Date createTime;
 
-	public void setAwardActivityId(String awardActivityId) {
-		this.awardActivityId = awardActivityId;
-	}
 
 	public Integer getStatus() {
 		return status;

src/main/java/com/ssj/bean/sys/award/domain/AwardConsume.java

@@ -1,100 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.Date;
-
-
-@Entity
-@Table(name="tb_award_consume")
-public class AwardConsume extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String fromMerchantId;
-	
-	private String toMerchantId;
-	
-	private String awardMaterialId;
-	
-	private Integer number;
-	
-	private Integer type;
-	
-	private String vipId; 
-	
-	private String remarks; 
-	
-	private Date createTime;
-
-	public String getFromMerchantId() {
-		return fromMerchantId;
-	}
-
-	public void setFromMerchantId(String fromMerchantId) {
-		this.fromMerchantId = fromMerchantId;
-	}
-
-	public String getToMerchantId() {
-		return toMerchantId;
-	}
-
-	public void setToMerchantId(String toMerchantId) {
-		this.toMerchantId = toMerchantId;
-	}
-
-	public String getAwardMaterialId() {
-		return awardMaterialId;
-	}
-
-	public void setAwardMaterialId(String awardMaterialId) {
-		this.awardMaterialId = awardMaterialId;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public String getVipId() {
-		return vipId;
-	}
-
-	public void setVipId(String vipId) {
-		this.vipId = vipId;
-	}
-
-	public String getRemarks() {
-		return remarks;
-	}
-
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	
-	
-	
-
-}

src/main/java/com/ssj/bean/sys/award/domain/AwardGrant.java

@@ -1,251 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.alibaba.fastjson.JSONArray;
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-
-@Entity
-@Table(name="tb_award_grant")
-public class AwardGrant extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String fromMerchantId;
-	
-	private String toMerchantId;
-	
-//	private String level1MaterialId;
-//	
-//	private String level2MaterialId;
-//	
-//	private String level3MaterialId;
-	
-	private JSONArray level1MaterialIdJson;
-	
-	private JSONArray level2MaterialIdJson;
-	
-	private JSONArray level3MaterialIdJson;
-	
-	private Integer level1Num;
-	
-	private Integer level2Num;
-	
-	private Integer level3Num;
-	
-	private String remarks;
-	
-	private Date createTime;
-	
-	private Date updateTime;
-	
-	private String dingNumber;
-	
-	private String emsNumber;
-	
-	private String people;
-	
-	private String telephone;
-
-	private String img;
-	
-	private String address;
-	
-	private Date emsTime;
-	
-	private Integer status;
-
-	public String getFromMerchantId() {
-		return fromMerchantId;
-	}
-
-	public void setFromMerchantId(String fromMerchantId) {
-		this.fromMerchantId = fromMerchantId;
-	}
-
-	public String getToMerchantId() {
-		return toMerchantId;
-	}
-
-	public void setToMerchantId(String toMerchantId) {
-		this.toMerchantId = toMerchantId;
-	}
-
-//	@Column(name = "level1_material_id")
-//	public String getLevel1MaterialId() {
-//		return level1MaterialId;
-//	}
-//
-//	public void setLevel1MaterialId(String level1MaterialId) {
-//		this.level1MaterialId = level1MaterialId;
-//	}
-//
-//	@Column(name = "level2_material_id")
-//	public String getLevel2MaterialId() {
-//		return level2MaterialId;
-//	}
-//
-//	public void setLevel2MaterialId(String level2MaterialId) {
-//		this.level2MaterialId = level2MaterialId;
-//	}
-//
-//	@Column(name = "level3_material_id")
-//	public String getLevel3MaterialId() {
-//		return level3MaterialId;
-//	}
-//
-//	public void setLevel3MaterialId(String level3MaterialId) {
-//		this.level3MaterialId = level3MaterialId;
-//	}
-
-	@Column(name = "level1_num")
-	public Integer getLevel1Num() {
-		return level1Num;
-	}
-	
-	public void setLevel1Num(Integer level1Num) {
-		this.level1Num = level1Num;
-	}
-
-	@Column(name = "level2_num")
-	public Integer getLevel2Num() {
-		return level2Num;
-	}
-
-	public void setLevel2Num(Integer level2Num) {
-		this.level2Num = level2Num;
-	}
-
-	@Column(name = "level3_num")
-	public Integer getLevel3Num() {
-		return level3Num;
-	}
-
-	public void setLevel3Num(Integer level3Num) {
-		this.level3Num = level3Num;
-	}
-
-	public String getRemarks() {
-		return remarks;
-	}
-
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getDingNumber() {
-		return dingNumber;
-	}
-
-	public void setDingNumber(String dingNumber) {
-		this.dingNumber = dingNumber;
-	}
-
-	public String getEmsNumber() {
-		return emsNumber;
-	}
-
-	public void setEmsNumber(String emsNumber) {
-		this.emsNumber = emsNumber;
-	}
-
-	public String getPeople() {
-		return people;
-	}
-
-	public void setPeople(String people) {
-		this.people = people;
-	}
-
-	public String getTelephone() {
-		return telephone;
-	}
-
-	public void setTelephone(String telephone) {
-		this.telephone = telephone;
-	}
-
-	public String getImg() {
-		return img;
-	}
-
-	public void setImg(String img) {
-		this.img = img;
-	}
-
-	public Date getEmsTime() {
-		return emsTime;
-	}
-
-	public void setEmsTime(Date emsTime) {
-		this.emsTime = emsTime;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	
-	@Transient
-	public JSONArray getLevel1MaterialIdJson() {
-		return level1MaterialIdJson;
-	}
-
-	public void setLevel1MaterialIdJson(JSONArray level1MaterialIdJson) {
-		this.level1MaterialIdJson = level1MaterialIdJson;
-	}
-	
-	@Transient
-	public JSONArray getLevel2MaterialIdJson() {
-		return level2MaterialIdJson;
-	}
-
-	public void setLevel2MaterialIdJson(JSONArray level2MaterialIdJson) {
-		this.level2MaterialIdJson = level2MaterialIdJson;
-	}
-	
-	@Transient
-	public JSONArray getLevel3MaterialIdJson() {
-		return level3MaterialIdJson;
-	}
-
-	public void setLevel3MaterialIdJson(JSONArray level3MaterialIdJson) {
-		this.level3MaterialIdJson = level3MaterialIdJson;
-	}
-
-
-
-}

src/main/java/com/ssj/bean/sys/award/domain/AwardGrantInfo.java

@@ -1,69 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-
-@Entity
-@Table(name="tb_award_grant_info")
-public class AwardGrantInfo extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String grantId;
-	
-	private String materialId;
-	
-	private Integer level;
-	
-	private Integer num;
-	
-	private Date createTime;
-
-	public String getGrantId() {
-		return grantId;
-	}
-
-	public void setGrantId(String grantId) {
-		this.grantId = grantId;
-	}
-
-	public String getMaterialId() {
-		return materialId;
-	}
-
-	public void setMaterialId(String materialId) {
-		this.materialId = materialId;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Integer getNum() {
-		return num;
-	}
-
-	public void setNum(Integer num) {
-		this.num = num;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	
-	
-}

src/main/java/com/ssj/bean/sys/award/domain/AwardMaterial.java

@@ -25,10 +25,6 @@ public class AwardMaterial extends BaseEntity {
 	
 	private Integer stockNumber;
 	
-	private Integer useNumber;
-	
-	private Integer lockNumber;
-	
 	private Date updateTime; 
 	
 	private Date createTime; 
@@ -109,22 +105,6 @@ public class AwardMaterial extends BaseEntity {
 		this.status = status;
 	}
 
-	public Integer getUseNumber() {
-		return useNumber;
-	}
-
-	public void setUseNumber(Integer useNumber) {
-		this.useNumber = useNumber;
-	}
-
-	public Integer getLockNumber() {
-		return lockNumber;
-	}
-
-	public void setLockNumber(Integer lockNumber) {
-		this.lockNumber = lockNumber;
-	}
-
 	public String getPrice() {
 		return price;
 	}

src/main/java/com/ssj/bean/sys/award/domain/AwardSncode.java

@@ -13,19 +13,18 @@ public class AwardSncode extends BaseEntity {
 	
 	private static final long serialVersionUID = 1L;
 	
-	private String libId;
+	private String awardMaterialId;
 	
 	private String snCode;
 	
 	private String snImg;
 	
-	private String awardActivityId;
+	private Integer status;
 	
-	private String awardMaterialId;
 	
-	private Integer status;
 	
-	private Integer type;
+	
+	private String libId;
 	
 	private String userId;
 	
@@ -35,124 +34,194 @@ public class AwardSncode extends BaseEntity {
 	
 	private Date updateTime;
 	
+	private Integer type;
+	
 	private Date drawTime;
 	
 	private Date closureTime;
 	
 	private String closureUser;
 	
+	
+	
+	
+	private String dingNumber;
+	
+	private String emsNumber;
+	
+	private String people;
+	
+	private String telephone;
+	
+	private String img;
+	
+	private String address;
+	
+	private Date emsTime;
+
+	
+	
+	
+	public String getAwardMaterialId() {
+		return awardMaterialId;
+	}
 
 	public String getSnCode() {
 		return snCode;
 	}
 
-	public void setSnCode(String snCode) {
-		this.snCode = snCode;
+	public String getSnImg() {
+		return snImg;
 	}
 
-	public String getAwardActivityId() {
-		return awardActivityId;
+	public Integer getStatus() {
+		return status;
 	}
 
-	public void setAwardActivityId(String awardActivityId) {
-		this.awardActivityId = awardActivityId;
+	public String getLibId() {
+		return libId;
 	}
 
-	public String getAwardMaterialId() {
-		return awardMaterialId;
+	public String getUserId() {
+		return userId;
 	}
 
-	public void setAwardMaterialId(String awardMaterialId) {
-		this.awardMaterialId = awardMaterialId;
+	public String getVipId() {
+		return vipId;
 	}
 
-	public Integer getStatus() {
-		return status;
+	public Date getCreateTime() {
+		return createTime;
 	}
 
-	public void setStatus(Integer status) {
-		this.status = status;
+	public Date getUpdateTime() {
+		return updateTime;
 	}
 
-	public String getUserId() {
-		return userId;
+	public Integer getType() {
+		return type;
 	}
 
-	public void setUserId(String userId) {
-		this.userId = userId;
+	public Date getDrawTime() {
+		return drawTime;
 	}
 
-	public String getVipId() {
-		return vipId;
+	public Date getClosureTime() {
+		return closureTime;
 	}
 
-	public void setVipId(String vipId) {
-		this.vipId = vipId;
+	public String getClosureUser() {
+		return closureUser;
 	}
 
-	public Date getCreateTime() {
-		return createTime;
+	public String getDingNumber() {
+		return dingNumber;
 	}
 
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
+	public String getEmsNumber() {
+		return emsNumber;
 	}
 
-	public Date getUpdateTime() {
-		return updateTime;
+	public String getPeople() {
+		return people;
 	}
 
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
+	public String getTelephone() {
+		return telephone;
 	}
 
-	public String getSnImg() {
-		return snImg;
+	public String getImg() {
+		return img;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public Date getEmsTime() {
+		return emsTime;
+	}
+
+	public void setAwardMaterialId(String awardMaterialId) {
+		this.awardMaterialId = awardMaterialId;
+	}
+
+	public void setSnCode(String snCode) {
+		this.snCode = snCode;
 	}
 
 	public void setSnImg(String snImg) {
 		this.snImg = snImg;
 	}
 
-	public Integer getType() {
-		return type;
+	public void setStatus(Integer status) {
+		this.status = status;
 	}
 
-	public void setType(Integer type) {
-		this.type = type;
+	public void setLibId(String libId) {
+		this.libId = libId;
 	}
 
-	public Date getDrawTime() {
-		return drawTime;
+	public void setUserId(String userId) {
+		this.userId = userId;
 	}
 
-	public void setDrawTime(Date drawTime) {
-		this.drawTime = drawTime;
+	public void setVipId(String vipId) {
+		this.vipId = vipId;
 	}
 
-	public Date getClosureTime() {
-		return closureTime;
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
 	}
 
-	public void setClosureTime(Date closureTime) {
-		this.closureTime = closureTime;
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
 	}
 
-	public String getClosureUser() {
-		return closureUser;
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public void setDrawTime(Date drawTime) {
+		this.drawTime = drawTime;
+	}
+
+	public void setClosureTime(Date closureTime) {
+		this.closureTime = closureTime;
 	}
 
 	public void setClosureUser(String closureUser) {
 		this.closureUser = closureUser;
 	}
 
-	public String getLibId() {
-		return libId;
+	public void setDingNumber(String dingNumber) {
+		this.dingNumber = dingNumber;
 	}
 
-	public void setLibId(String libId) {
-		this.libId = libId;
+	public void setEmsNumber(String emsNumber) {
+		this.emsNumber = emsNumber;
+	}
+
+	public void setPeople(String people) {
+		this.people = people;
 	}
 
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public void setImg(String img) {
+		this.img = img;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public void setEmsTime(Date emsTime) {
+		this.emsTime = emsTime;
+	}
+	
+	
 
 }

src/main/java/com/ssj/bean/sys/award/domain/AwardStock.java

@@ -1,56 +0,0 @@
-package com.ssj.bean.sys.award.domain;
-
-import com.ssj.bean.common.framework.core.domain.BaseEntity;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-
-@Entity
-@Table(name="tb_award_stock")
-public class AwardStock extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String merchantId;
-	
-	private String awardMaterialId;
-	
-	private Integer stockNumber;
-	
-	private Integer useNumber;
-	
-	public String getMerchantId() {
-		return merchantId;
-	}
-
-	public void setMerchantId(String merchantId) {
-		this.merchantId = merchantId;
-	}
-
-	public String getAwardMaterialId() {
-		return awardMaterialId;
-	}
-
-	public void setAwardMaterialId(String awardMaterialId) {
-		this.awardMaterialId = awardMaterialId;
-	}
-
-	public Integer getStockNumber() {
-		return stockNumber;
-	}
-
-	public void setStockNumber(Integer stockNumber) {
-		this.stockNumber = stockNumber;
-	}
-
-	public Integer getUseNumber() {
-		return useNumber;
-	}
-
-	public void setUseNumber(Integer useNumber) {
-		this.useNumber = useNumber;
-	}
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardActivityDao.java

@@ -1,32 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import com.ssj.bean.sys.award.domain.AwardActivity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.Map;
-
-@Repository
-public interface AwardActivityDao extends JpaRepository<AwardActivity, String>{
-	
-	
-	@Query(nativeQuery = true, value = " SELECT * from tb_award_activity t WHERE t.merchant_id=?1 AND t.status=?2 LIMIT 1 ")
-	public AwardActivity getAwardActivityByMerchantId(String merchantId,Integer status);
-	
-	
-	@Query(nativeQuery = true, value = 
-			  " SELECT t.*, "
-			+ " m1.`name` as level1_material_name ,m1.img as level1_material_img,m1.`level` as level1_material_level,m1.exchange_integral as level1_material_exchange_integral, "
-			+ " m2.`name` as level2_material_name ,m2.img as level2_material_img,m2.`level` as level2_material_level,m2.exchange_integral as level2_material_exchange_integral, "
-			+ " m3.`name` as level3_material_name ,m3.img as level3_material_img,m1.`level` as level3_material_level,m3.exchange_integral as level3_material_exchange_integral "
-			+ " from tb_award_activity t  "
-			+ " LEFT JOIN tb_award_material m1 ON t.level1_material_id=m1.id "
-			+ " LEFT JOIN tb_award_material m2 ON t.level2_material_id=m2.id "
-			+ " LEFT JOIN tb_award_material m3 ON t.level3_material_id=m3.id "
-			+ " WHERE t.merchant_id=?1 AND t.status=?2 LIMIT 1 ")
-	public Map<String,Object> getAwardActivityMapByMerchantId(String merchantId,Integer status);
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardActivityInfoDao.java

@@ -1,19 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import com.ssj.bean.sys.award.domain.AwardActivityInfo;
-
-@Repository
-public interface AwardActivityInfoDao extends JpaRepository<AwardActivityInfo, String>{
-	
-	@Query(nativeQuery = true, value = " SELECT * from tb_award_activity_info t WHERE t.activity_id=?1 ORDER BY t.create_time ASC ")
-	public List<AwardActivityInfo> findAwardActivityInfoByActivityId(String activityId);
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardConsumeDao.java

@@ -1,12 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import com.ssj.bean.sys.award.domain.AwardConsume;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AwardConsumeDao extends JpaRepository<AwardConsume, String>{
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardGrantDao.java

@@ -1,13 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import com.ssj.bean.sys.award.domain.AwardGrant;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AwardGrantDao extends JpaRepository<AwardGrant, String>{
-	
-
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardGrantInfoDao.java

@@ -1,22 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import com.ssj.bean.sys.award.domain.AwardGrantInfo;
-
-@Repository
-public interface AwardGrantInfoDao extends JpaRepository<AwardGrantInfo, String>{
-	
-	@Query(nativeQuery = true, value = " SELECT * from tb_award_grant_info t WHERE t.grant_id=?1 ORDER BY t.create_time ASC ")
-	public List<AwardGrantInfo> findAwardGrantInfoByGrantId(String grantId);
-	
-	@Query(nativeQuery = true, value = " SELECT * from tb_award_grant_info t WHERE t.grant_id=?1 and t.level=?2 ORDER BY t.create_time ASC ")
-	public List<AwardGrantInfo> findAwardGrantInfoByGrantId(String grantId,Integer level);
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/AwardStockDao.java

@@ -1,17 +0,0 @@
-package com.ssj.dao.sys.award.dao;
-
-
-import com.ssj.bean.sys.award.domain.AwardStock;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AwardStockDao extends JpaRepository<AwardStock, String>{
-	
-	
-	@Query(nativeQuery = true, value = " SELECT * from tb_award_stock t WHERE t.merchant_id=?1 and t.award_material_id=?2 LIMIT 1 ")
-	public AwardStock getAwardStockByMaterialId(String merchantId,String awardMaterialId);
-	
-	
-}

src/main/java/com/ssj/dao/sys/award/dao/impl/AwardQueryDaoImpl.java

@@ -30,7 +30,10 @@ public class AwardQueryDaoImpl implements AwardQueryDao {
 	public Page<Map<String, Object>> findAwardMaterialBylist(Map<String, Object> searchParams, Pageable pageable) {
 		StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSQL.append(" SELECT * from tb_award_material t WHERE t.status=1  ");
+        selSQL.append(" SELECT t.*, ");
+        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode t WHERE t.`status` in (0)) as not_use_number, ");
+        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode t WHERE t.`status` in (1,2,3,4)) as use_number ");
+        selSQL.append(" from tb_award_material t WHERE t.status=1  ");
         if (searchParams.get("name") != null && !searchParams.get("name").equals("")) {
         	selSQL.append(" and  t.`name` LIKE  CONCAT(CONCAT('%',?,'%')) ");
         	queryParams.add(searchParams.get("name"));
@@ -285,23 +288,17 @@ public class AwardQueryDaoImpl implements AwardQueryDao {
 	public Page<Map<String, Object>> findAwardSncodeBylist(Map<String, Object> searchParams, Pageable pageable) {
 		StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSQL.append(" SELECT t.*,a.title,fm.unit_name,m.`name`,m.`level`,v.parent_name,v.child_name from tb_award_sncode t   ");
-        selSQL.append("	LEFT JOIN tb_award_activity a ON t.award_activity_id=a.id ");
-        selSQL.append(" LEFT JOIN fx_merchant fm ON fm.id=a.merchant_id ");
+        selSQL.append(" SELECT t.*,m.`name`,m.`level`,v.parent_name,v.child_name,j.league_name from tb_award_sncode t     ");
         selSQL.append(" LEFT JOIN tb_award_material m ON t.award_material_id=m.id ");
         selSQL.append(" LEFT JOIN tb_lib_vip v ON t.vip_id=v.id ");
-        selSQL.append(" WHERE t.`status`!=4 ");
-        if (searchParams.get("awardActivityId") != null && !searchParams.get("awardActivityId").equals("")) {
-        	selSQL.append(" AND  t.`award_activity_id`=? ");
-        	queryParams.add(searchParams.get("awardActivityId"));
-        }
+        selSQL.append(" LEFT JOIN tb_lib_join j ON t.lib_id=j.id WHERE 1=1 ");
         if (searchParams.get("awardMaterialId") != null && !searchParams.get("awardMaterialId").equals("")) {
         	selSQL.append(" AND  t.`award_material_id`=? ");
         	queryParams.add(searchParams.get("awardMaterialId"));
         }
-        if (searchParams.get("merchantId") != null && !searchParams.get("merchantId").equals("")) {
-        	String[] inList=searchParams.get("merchantId").toString().split(";");
-			selSQL.append(" AND a.merchant_id IN  ('").append(String.join("','",inList)).append("')");
+        if (searchParams.get("leagueName") != null && !searchParams.get("leagueName").equals("")) {
+        	selSQL.append(" AND  j.league_name LIKE  CONCAT(CONCAT('%',?,'%')) ");
+        	queryParams.add(searchParams.get("leagueName"));
         }
         if (searchParams.get("snCode") != null && !searchParams.get("snCode").equals("")) {
         	selSQL.append(" AND  t.`sn_code`=? ");
@@ -315,20 +312,22 @@ public class AwardQueryDaoImpl implements AwardQueryDao {
         	selSQL.append(" AND  m.`level`=? ");
         	queryParams.add(searchParams.get("level"));
         }
-        
-        if (searchParams.get("status") != null && !searchParams.get("status").equals("")) {
-        	selSQL.append(" AND  m.`status`=? ");
-        	queryParams.add(searchParams.get("status"));
+        if (searchParams.get("emsstatus") != null && searchParams.get("emsstatus").equals("0")) {
+        	selSQL.append(" AND  t.`ems_time` is null ");
         }
-        if (searchParams.get("startTime") != null && !searchParams.get("startTime").equals("")) {
-        	selSQL.append(" AND  TO_DAYS(t.`update_time`) >= TO_DAYS(?) ");
-        	queryParams.add(searchParams.get("startTime"));
+        if (searchParams.get("emsstatus") != null && searchParams.get("emsstatus").equals("1")) {
+        	selSQL.append(" AND  t.`ems_time` is not null ");
         }
-        if (searchParams.get("endTime") != null && !searchParams.get("endTime").equals("")) {
-        	selSQL.append(" AND  TO_DAYS(t.`update_time`) <= TO_DAYS(?) ");
-        	queryParams.add(searchParams.get("endTime"));
+        if (searchParams.get("status") != null && !searchParams.get("status").equals("")) {
+        	String[] inList=searchParams.get("status").toString().split(";");
+        	selSQL.append(" AND t.`status` IN  ('").append(String.join("','",inList)).append("')");
+        }
+        
+        if (searchParams.get("order") != null && !searchParams.get("order").equals("")) {
+        	selSQL.append(" ORDER BY t."+searchParams.get("order")+" DESC ");
+        }else {
+        	selSQL.append(" ORDER BY t.create_time DESC ");
         }
-        selSQL.append(" ORDER BY t.update_time DESC ");
         return dao.findPage(selSQL.toString(), queryParams.toArray(), pageable);
 	}
 

src/main/java/com/ssj/service/sys/award/service/AwardActivityInfoService.java

@@ -1,17 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import com.ssj.bean.sys.award.domain.AwardActivityInfo;
-import com.ssj.framework.core.common.service.BaseService;
-
-public interface AwardActivityInfoService extends BaseService<AwardActivityInfo, String> {
-	
-	public List<AwardActivityInfo> findAwardActivityInfoByActivityId(String activityId);
-	
-	public Page<Map<String, Object>> findAwardActivityInfoByActivityId(Map<String, Object> searchParams,Pageable pageable);
-}

src/main/java/com/ssj/service/sys/award/service/AwardActivityService.java

@@ -1,29 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import com.ssj.bean.sys.award.domain.AwardActivity;
-import com.ssj.framework.core.common.service.BaseService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
-
-public interface AwardActivityService extends BaseService<AwardActivity, String> {
-	
-	   Page<Map<String, Object>> findAwardActivityBylist(Map<String, Object> searchParams, Pageable pageable);
-	   
-	   //创建活动
-	   public boolean createAwardActivityAndAwardStock(AwardActivity awardActivity);
-	   
-	   //更新活动状态
-	   public boolean updateAwardActivityByStatus(AwardActivity awardActivity,Integer status);
-	   
-	   //通过商户Id,查询出正在发布的活动。
-	   public AwardActivity getAwardActivityByMerchantId(String merchantId,Integer status);
-	   
-	   //通过商户Id,查询出正在发布的活动，包含了各个奖品的明细信息
-	   public Map<String,Object> getAwardActivityMapByMerchantId(String merchantId,Integer status);
-	   
-	   //使用积分兑换奖品
-	   public Integer exchangeAwardActivityByMaterialId(String userId,String vipId,String materialId);
-	   
-}

src/main/java/com/ssj/service/sys/award/service/AwardConsumeService.java

@@ -1,21 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import com.ssj.bean.sys.award.domain.AwardConsume;
-import com.ssj.framework.core.common.service.BaseService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AwardConsumeService extends BaseService<AwardConsume, String> {
-	
-	public Page<Map<String, Object>> findAwardConsumeBylist(Map<String, Object> searchParams, Pageable pageable);
-	
-	public Page<Map<String, Object>> findAwardConsumeByAwardMaterial(Map<String, Object> searchParams, Pageable pageable);
-	
-	public void saveAwardConsumeLog(AwardConsume awardConsume);
-	
-	public void saveAwardConsumeLog(List<AwardConsume> awardConsumes);
-	
-}

src/main/java/com/ssj/service/sys/award/service/AwardGrantInfoService.java

@@ -1,18 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import com.ssj.bean.sys.award.domain.AwardGrantInfo;
-import com.ssj.framework.core.common.service.BaseService;
-
-public interface AwardGrantInfoService extends BaseService<AwardGrantInfo, String> {
-	
-	public List<AwardGrantInfo> findAwardGrantInfoByGrantId(String grantId);
-	
-	public Page<Map<String,Object>> findAwardGrantInfoByGrantId(Map<String, Object> searchParams, Pageable pageable);
-	
-}

src/main/java/com/ssj/service/sys/award/service/AwardGrantService.java

@@ -1,21 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import com.ssj.bean.sys.award.domain.AwardGrant;
-import com.ssj.framework.core.common.service.BaseService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
-
-public interface AwardGrantService extends BaseService<AwardGrant, String> {
-	
-	public Page<Map<String, Object>> findAwardGrantBylist(Map<String, Object> searchParams, Pageable pageable);
-	
-	public boolean addAwardGrantAndAwardStock(AwardGrant awardGrant);
-	
-	public boolean addAwardGrantAndAwardStockBySSJFX(AwardGrant awardGrant);
-	
-	public boolean updateAwardGrantByStatus(AwardGrant awardGrant, Integer status);
-	
-	
-}

src/main/java/com/ssj/service/sys/award/service/AwardMaterialService.java

@@ -16,4 +16,6 @@ public interface AwardMaterialService extends BaseService<AwardMaterial, String>
 	
 	public AwardMaterial getAwardMaterialById(String id);
 	
+	public AwardMaterial addNumberAndSnCode(String id,Integer number);
+	
 }

src/main/java/com/ssj/service/sys/award/service/AwardSncodeService.java

@@ -1,51 +1,24 @@
 package com.ssj.service.sys.award.service;
 
-import com.ssj.bean.sys.award.domain.AwardActivity;
-import com.ssj.bean.sys.award.domain.AwardSncode;
-import com.ssj.framework.core.common.service.BaseService;
+import java.util.Map;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import java.util.List;
-import java.util.Map;
+import com.ssj.bean.sys.award.domain.AwardMaterial;
+import com.ssj.bean.sys.award.domain.AwardSncode;
+import com.ssj.framework.core.common.service.BaseService;
 
 public interface AwardSncodeService extends BaseService<AwardSncode, String> {
 	
 	Page<Map<String, Object>> findAwardSncodeBylist(Map<String, Object> searchParams, Pageable pageable);
 	
-	//查出活动中所有的奖品code
-	List<AwardSncode> findAwardSncodeByAwardActivityId(String awardActivityId,Integer status);
-	
-	//查出活动中指定等奖的奖品code
-	List<AwardSncode> findAwardSncodeByAwardMaterialId(String awardActivityId,String awardMaterialId,Integer status);
-	
 	//通过活动，生成sn_code列表
-	public void createAwardSncodeByCode(AwardActivity awardActivity);
-	
-	//取消活动，不通过活动，把没未中奖的sn_code取消，库存添加到商户的奖品库存下。
-	public void cleanAwardSncodeByCode(AwardActivity awardActivity);
-	
-	//通过活动id和奖品的id,随机查询出一条"未使用"的sncode
-	public AwardSncode randomAwardSncodeByActivityIdAndMaterialId(String awardActivityId,String materialId);
-	
+	public void createAwardSncodeByCode(AwardMaterial awardMaterial,Integer num);
+
 	//我的奖品列表
 	Page<Map<String, Object>> findAwardSncodeByVipList(Map<String, Object> searchParams, Pageable pageable);
 	
-	//查询sncode
-	public AwardSncode getAwardSncodeBySnCode(String snCode);
-	
-	//加载sncode到redis
-	public boolean loadAwardSncodeToRedisByActivityId(String awardActivityId);
-	
-	//从redis抽奖一条返回，从redis中删除记录。
-	public AwardSncode randomAwardSncodeRedisByActivityId(String awardActivityId);
-	
-	//抽奖的各种业务
-	public AwardSncode awardSncodeByActivityId(String userId,String vipId,String awardActivityId);
-	
-	//兑换奖品，从redis中删除sncode奖信息
-	public void cleanAwardSncodeResisByCode(String awardActivityId,String snCode);
-	
 	//更新兑换码的图片
 	public void updateSnCodeImgBySnCode(String snCode,String snCodeImg);
 	

src/main/java/com/ssj/service/sys/award/service/AwardStockService.java

@@ -1,18 +0,0 @@
-package com.ssj.service.sys.award.service;
-
-import com.ssj.bean.sys.award.domain.AwardStock;
-import com.ssj.framework.core.common.service.BaseService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
-
-public interface AwardStockService extends BaseService<AwardStock, String> {
-	
-	Page<Map<String, Object>> findAwardStockBylist(Map<String, Object> searchParams, Pageable pageable);
-	
-	public AwardStock getAwardStockByMaterialId(String merchantId,String awardMaterialId);
-	
-	public Integer getStockNumByMerchantIdAndLevelMaterialId(String merchantId, String levelMaterialId);
-	
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardActivityServiceImpl.java

@@ -1,308 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ssj.bean.sys.award.domain.AwardActivity;
-import com.ssj.bean.sys.award.domain.AwardActivityInfo;
-import com.ssj.bean.sys.award.domain.AwardActivityLog;
-import com.ssj.bean.sys.award.domain.AwardConsume;
-import com.ssj.bean.sys.award.domain.AwardMaterial;
-import com.ssj.bean.sys.award.domain.AwardSncode;
-import com.ssj.bean.sys.award.domain.AwardStock;
-import com.ssj.bean.sys.fx.domain.Merchant;
-import com.ssj.dao.sys.award.dao.AwardActivityDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.conch.conch.service.HomeworkRankingService;
-import com.ssj.service.sys.award.service.AwardActivityInfoService;
-import com.ssj.service.sys.award.service.AwardActivityLogService;
-import com.ssj.service.sys.award.service.AwardActivityService;
-import com.ssj.service.sys.award.service.AwardConsumeService;
-import com.ssj.service.sys.award.service.AwardMaterialService;
-import com.ssj.service.sys.award.service.AwardSncodeService;
-import com.ssj.service.sys.award.service.AwardStockService;
-import com.ssj.service.sys.fx.service.MerchantService;
-
-@Service
-@Transactional
-public class AwardActivityServiceImpl extends BaseServiceImpl<AwardActivity, String> implements AwardActivityService {
-	
-	@Autowired
-	private AwardActivityDao  awardActivityDao;
-
-	@Autowired
-	private AwardQueryDao  queryDao;
-	
-	@Autowired
-	private  AwardStockService awardStockService;
-	
-	@Autowired
-	private  AwardConsumeService awardConsumeService;
-	
-	@Autowired
-	private  AwardSncodeService awardSncodeService;
-	
-	@Autowired
-	private  AwardMaterialService awardMaterialService;
-	
-	@Autowired
-	private  MerchantService merchantService;
-	
-	@Autowired
-	private  HomeworkRankingService homeworkRankingService; 
-	
-	@Autowired
-	private  AwardActivityLogService awardActivityLogService; 
-	
-	@Autowired
-	private  AwardActivityInfoService awardActivityInfoService; 
-	
-	@Override
-	public PagingAndSortingRepository<AwardActivity, String> getDao() {
-		return awardActivityDao;
-	}
-
-	@Override
-	public Page<Map<String, Object>> findAwardActivityBylist(Map<String, Object> searchParams, Pageable pageable) {
-		return queryDao.findAwardActivityBylist(searchParams, pageable);
-	}
-
-	//发布活动，同时扣除商户下的库存。
-	@Override
-	public boolean createAwardActivityAndAwardStock(AwardActivity awardActivity) {
-		List<AwardStock> awardStocks=new ArrayList<AwardStock>();
-		List<AwardConsume> awardConsumes=new ArrayList<AwardConsume>();
-		List<AwardActivityInfo> awardActivityInfos=new ArrayList<AwardActivityInfo>();
-		
-		if(awardActivity.getLevel1MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardActivity.getLevel1MaterialIdJson();
-			for (Object object : jsonArray) {
-				
-				JSONObject jsonObject=(JSONObject)object;
-				
-				AwardStock awardStock=awardStockService.getAwardStockByMaterialId(awardActivity.getMerchantId(), jsonObject.getString("level1MaterialId"));
-				if(awardStock==null || awardStock.getStockNumber()<jsonObject.getIntValue("level1Num")) {
-					return false;
-				}
-				awardStock.setStockNumber(awardStock.getStockNumber()-jsonObject.getIntValue("level1Num"));
-				awardStock.setUseNumber(awardStock.getUseNumber()+jsonObject.getIntValue("level1Num"));
-				awardStocks.add(awardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardActivity.getMerchantId());
-				awardConsume.setToMerchantId(null);
-				awardConsume.setAwardMaterialId(jsonObject.getString("level1MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level1Num"));
-				awardConsume.setType(3);
-				awardConsume.setRemarks("创建活动消耗");
-				awardConsumes.add(awardConsume);
-				
-				AwardActivityInfo awardActivityInfo=new AwardActivityInfo();
-				awardActivityInfo.setCreateTime(new Date());
-				awardActivityInfo.setLevel(1);
-				awardActivityInfo.setMaterialId(jsonObject.getString("level1MaterialId"));
-				awardActivityInfo.setNum(jsonObject.getIntValue("level1Num"));
-				awardActivityInfos.add(awardActivityInfo);
-			}
-		}
-		
-		
-		if(awardActivity.getLevel2MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardActivity.getLevel2MaterialIdJson();
-			for (Object object : jsonArray) {
-				
-				JSONObject jsonObject=(JSONObject)object;
-				
-				AwardStock awardStock=awardStockService.getAwardStockByMaterialId(awardActivity.getMerchantId(), jsonObject.getString("level2MaterialId"));
-				if(awardStock==null || awardStock.getStockNumber()<jsonObject.getIntValue("level2Num")) {
-					return false;
-				}
-				awardStock.setStockNumber(awardStock.getStockNumber()-jsonObject.getIntValue("level2Num"));
-				awardStock.setUseNumber(awardStock.getUseNumber()+jsonObject.getIntValue("level2Num"));
-				awardStocks.add(awardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardActivity.getMerchantId());
-				awardConsume.setToMerchantId(null);
-				awardConsume.setAwardMaterialId(jsonObject.getString("level2MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level2Num"));
-				awardConsume.setType(3);
-				awardConsume.setRemarks("创建活动消耗");
-				awardConsumes.add(awardConsume);
-				
-				AwardActivityInfo awardActivityInfo=new AwardActivityInfo();
-				awardActivityInfo.setCreateTime(new Date());
-				awardActivityInfo.setLevel(2);
-				awardActivityInfo.setMaterialId(jsonObject.getString("level2MaterialId"));
-				awardActivityInfo.setNum(jsonObject.getIntValue("level2Num"));
-				awardActivityInfos.add(awardActivityInfo);
-			}
-		}
-		
-		if(awardActivity.getLevel3MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardActivity.getLevel3MaterialIdJson();
-			for (Object object : jsonArray) {
-				
-				JSONObject jsonObject=(JSONObject)object;
-				
-				AwardStock awardStock=awardStockService.getAwardStockByMaterialId(awardActivity.getMerchantId(), jsonObject.getString("level3MaterialId"));
-				if(awardStock==null || awardStock.getStockNumber()<jsonObject.getIntValue("level3Num")) {
-					return false;
-				}
-				awardStock.setStockNumber(awardStock.getStockNumber()-jsonObject.getIntValue("level3Num"));
-				awardStock.setUseNumber(awardStock.getUseNumber()+jsonObject.getIntValue("level3Num"));
-				awardStocks.add(awardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardActivity.getMerchantId());
-				awardConsume.setToMerchantId(null);
-				awardConsume.setAwardMaterialId(jsonObject.getString("level3MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level3Num"));
-				awardConsume.setType(3);
-				awardConsume.setRemarks("创建活动消耗");
-				awardConsumes.add(awardConsume);
-				
-				AwardActivityInfo awardActivityInfo=new AwardActivityInfo();
-				awardActivityInfo.setCreateTime(new Date());
-				awardActivityInfo.setLevel(3);
-				awardActivityInfo.setMaterialId(jsonObject.getString("level3MaterialId"));
-				awardActivityInfo.setNum(jsonObject.getIntValue("level3Num"));
-				awardActivityInfos.add(awardActivityInfo);
-			}
-		}
-		
-		awardActivity.setUpdateTime(new Date());
-		awardActivity=this.save(awardActivity);
-		for (AwardActivityInfo awardActivityInfo : awardActivityInfos) {
-			awardActivityInfo.setActivityId(awardActivity.getId());
-		}
-		awardActivityInfoService.save(awardActivityInfos);
-		awardStockService.save(awardStocks);
-		awardConsumeService.saveAwardConsumeLog(awardConsumes);
-		
-		//直接发布的活动，直接生成奖品code列表
-		if(1==awardActivity.getStatus()) {
-			awardSncodeService.createAwardSncodeByCode(awardActivity);
-		}
-		return true;
-	}
-
-	@Override
-	public AwardActivity getAwardActivityByMerchantId(String merchantId, Integer status) {
-		return awardActivityDao.getAwardActivityByMerchantId(merchantId, status);
-	}
-
-	@Override
-	public synchronized boolean updateAwardActivityByStatus(AwardActivity awardActivity, Integer status) {
-		switch (status) {
-			case 0://取消活动
-				awardSncodeService.cleanAwardSncodeByCode(awardActivity);
-				break;
-			case 1://发布活动
-				awardSncodeService.createAwardSncodeByCode(awardActivity);
-				break;
-			case 2://审核中
-				
-				break;
-			case 3://审核不通过
-				awardSncodeService.cleanAwardSncodeByCode(awardActivity);
-				break;
-			default:
-				break;
-		}
-		awardActivity.setStatus(status);
-		awardActivity.setUpdateTime(new Date());
-		this.save(awardActivity);
-		return false;
-	}
-
-	@Override
-	public Map<String, Object> getAwardActivityMapByMerchantId(String merchantId, Integer status) {
-		List<Map<String, Object>> list=queryDao.getAwardActivityMapByMerchantId(merchantId, status);
-		return (list!=null && list.size()>0) ? list.get(0) : null;
-	}
-
-	@Override
-	public Integer exchangeAwardActivityByMaterialId(String userId,String vipId, String materialId) {
-		//兑换状态：1：兑换成功，2：积分不够，3：奖品库存不够
-		Integer status=3;
-		// # 查出vipId的积分
-        Integer integral=homeworkRankingService.searchIntegralByVipId(vipId);
-
-        Merchant merchant=merchantService.getDefaultMerchantByVipId(vipId);
-        if(merchant!=null) {//绑定的商户
-        	AwardActivity awardActivity=this.getAwardActivityByMerchantId(merchant.getId(), 1);
-        	if(awardActivity!=null) {
-        		
-        		//查物资的兑换积分
-        		AwardMaterial awardMaterial=awardMaterialService.getById(materialId);
-        		//2：积分不够
-                if(integral<awardMaterial.getExchangeIntegral()) {
-                	status=2;
-                	return status;
-                }
-        		
-                //查询奖码库存
-        		List<AwardSncode> awardSncodes=awardSncodeService.findAwardSncodeByAwardMaterialId(awardActivity.getId(), materialId,0);
-        		//3：奖品库存不够
-                if(awardSncodes==null || awardSncodes.size()<=0) {
-                	status=3;
-                	return status;
-                }
-                
-                //随机查一条奖码
-                AwardSncode awardSncode=awardSncodeService.randomAwardSncodeByActivityIdAndMaterialId(awardActivity.getId(),materialId);
-                if(awardSncode==null) {//3：奖品库存不够
-                	status=3;
-                	return status;
-                }
-                awardSncode.setUserId(userId);
-                awardSncode.setVipId(vipId);
-                awardSncode.setStatus(3);
-                awardSncode.setType(2);
-                awardSncode.setDrawTime(new Date());
-                awardSncode.setUpdateTime(new Date());
-                awardSncodeService.save(awardSncode);//更新奖码状态
-                
-                //清除redis中该奖品的信息
-                awardSncodeService.cleanAwardSncodeResisByCode(awardActivity.getId(), awardSncode.getSnCode());
-               
-                //减量积分
-                homeworkRankingService.saveRankIntegral(vipId, -awardMaterial.getExchangeIntegral(), 10, awardSncode.getSnCode());
-                
-                //保存活动记录
-                try {
-                	AwardActivityLog log=new AwardActivityLog();
-                	log.setAwardActivityId(awardActivity.getId());
-                	log.setUserId(userId);
-            		log.setVipId(vipId);
-                	log.setCreateTime(new Date());
-                	if(awardSncode!=null) {
-                		log.setAwardMaterialId(awardSncode.getAwardMaterialId());
-                		log.setSnCode(awardSncode.getSnCode());
-                		log.setStatus(2);
-                	}
-                	awardActivityLogService.save(log);
-            	} catch (Exception e) {
-            		e.printStackTrace();
-    			}
-                status=1;
-        	}
-        }
-		return status;
-	}
-
-
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardActivityServiceInfoImpl.java

@@ -1,47 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ssj.bean.sys.award.domain.AwardActivityInfo;
-import com.ssj.dao.sys.award.dao.AwardActivityInfoDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardActivityInfoService;
-
-@Service
-@Transactional
-public class AwardActivityServiceInfoImpl extends BaseServiceImpl<AwardActivityInfo, String> implements AwardActivityInfoService {
-	
-	@Autowired
-	private AwardActivityInfoDao  awardActivityInfoDao;
-
-	@Autowired
-	private AwardQueryDao  queryDao;
-	
-	@Override
-	public PagingAndSortingRepository<AwardActivityInfo, String> getDao() {
-		return awardActivityInfoDao;
-	}
-
-	@Override
-	public List<AwardActivityInfo> findAwardActivityInfoByActivityId(String activityId) {
-		return awardActivityInfoDao.findAwardActivityInfoByActivityId(activityId);
-	}
-
-	@Override
-	public Page<Map<String, Object>> findAwardActivityInfoByActivityId(Map<String, Object> searchParams,Pageable pageable) {
-		return queryDao.findAwardActivityInfoByActivityId(searchParams, pageable);
-	}
-
-	
-
-
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardConsumeServiceImpl.java

@@ -1,59 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import com.ssj.bean.sys.award.domain.AwardConsume;
-import com.ssj.dao.sys.award.dao.AwardConsumeDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardConsumeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Transactional
-public class AwardConsumeServiceImpl extends BaseServiceImpl<AwardConsume, String> implements AwardConsumeService {
-	
-	@Autowired
-	private AwardConsumeDao  awardConsumeDao;
-	
-	@Autowired
-	private AwardQueryDao  queryDao;
-
-	@Override
-	public PagingAndSortingRepository<AwardConsume, String> getDao() {
-		return awardConsumeDao;
-	}
-
-	@Override
-	public Page<Map<String, Object>> findAwardConsumeBylist(Map<String, Object> searchParams, Pageable pageable) {
-		return queryDao.findAwardConsumeBylist(searchParams, pageable);
-	}
-
-	@Override
-	public void saveAwardConsumeLog(AwardConsume awardConsume) {
-		awardConsume.setCreateTime(new Date());
-		this.save(awardConsume);
-	}
-
-	@Override
-	public Page<Map<String, Object>> findAwardConsumeByAwardMaterial(Map<String, Object> searchParams,Pageable pageable) {
-		return queryDao.findAwardConsumeByAwardMaterial(searchParams, pageable);
-	}
-
-	@Override
-	public void saveAwardConsumeLog(List<AwardConsume> awardConsumes) {
-		for (AwardConsume awardConsume : awardConsumes) {
-			this.saveAwardConsumeLog(awardConsume);
-		}
-	}
-
-
-	
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardGrantServiceImpl.java

@@ -1,445 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ssj.bean.sys.award.domain.AwardConsume;
-import com.ssj.bean.sys.award.domain.AwardGrant;
-import com.ssj.bean.sys.award.domain.AwardGrantInfo;
-import com.ssj.bean.sys.award.domain.AwardMaterial;
-import com.ssj.bean.sys.award.domain.AwardStock;
-import com.ssj.dao.sys.award.dao.AwardGrantDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardConsumeService;
-import com.ssj.service.sys.award.service.AwardGrantInfoService;
-import com.ssj.service.sys.award.service.AwardGrantService;
-import com.ssj.service.sys.award.service.AwardMaterialService;
-import com.ssj.service.sys.award.service.AwardStockService;
-
-@Service
-@Transactional
-public class AwardGrantServiceImpl extends BaseServiceImpl<AwardGrant, String> implements AwardGrantService {
-	
-	@Autowired
-	private AwardGrantDao  awardGrantDao;
-
-	@Autowired
-	private AwardQueryDao  queryDao;
-
-	@Autowired
-	private AwardStockService  awardStockService;
-	
-	@Autowired
-	private AwardMaterialService  awardMaterialService;
-	
-	@Autowired
-	private AwardConsumeService  awardConsumeService;
-	
-	@Autowired
-	private AwardGrantInfoService  awardGrantInfoService;
-
-	@Override
-	public PagingAndSortingRepository<AwardGrant, String> getDao() {
-		return awardGrantDao;
-	}
-
-
-	@Override
-	public Page<Map<String, Object>> findAwardGrantBylist(Map<String, Object> searchParams, Pageable pageable) {
-		return queryDao.findAwardGrantBylist(searchParams, pageable);
-	}
-
-	
-	@Override
-	public boolean addAwardGrantAndAwardStock(AwardGrant awardGrant) {	
-		List<AwardStock> awardStocks=new ArrayList<AwardStock>();
-		List<AwardConsume> awardConsumes=new ArrayList<AwardConsume>();
-		List<AwardGrantInfo> awardGrantInfos=new ArrayList<AwardGrantInfo>();
-		
-		
-		//指点商户的处理库存数
-		if(awardGrant.getLevel1MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel1MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-			
-				//减量
-				AwardStock fAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getFromMerchantId(), jsonObject.getString("level1MaterialId"));
-				if(fAwardStock==null) {
-					fAwardStock=new AwardStock();
-					fAwardStock.setMerchantId(awardGrant.getFromMerchantId());
-					fAwardStock.setAwardMaterialId(jsonObject.getString("level1MaterialId"));
-					fAwardStock.setStockNumber(0);
-					fAwardStock.setUseNumber(0);
-				}
-				fAwardStock.setStockNumber(fAwardStock.getStockNumber()-jsonObject.getIntValue("level1Num"));
-				awardStocks.add(fAwardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level1MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level1Num"));
-				awardConsume.setType(1);
-				awardConsume.setRemarks("我向下配送");
-				awardConsumes.add(awardConsume);
-				
-				
-				//增量
-				AwardStock tAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getToMerchantId(), jsonObject.getString("level1MaterialId"));
-				if(tAwardStock==null) {
-					tAwardStock=new AwardStock();
-					tAwardStock.setMerchantId(awardGrant.getToMerchantId());
-					tAwardStock.setAwardMaterialId(jsonObject.getString("level1MaterialId"));
-					tAwardStock.setStockNumber(0);
-					tAwardStock.setUseNumber(0);
-				}
-				tAwardStock.setStockNumber(tAwardStock.getStockNumber()+jsonObject.getIntValue("level1Num"));
-				awardStocks.add(tAwardStock);
-				
-				awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level1MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level1Num"));
-				awardConsume.setType(2);
-				awardConsume.setRemarks("上级向我配送");
-				awardConsumes.add(awardConsume);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level3MaterialId"));
-				awardGrantInfo.setLevel(3);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level3Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-			
-			}
-		}
-		
-		if(awardGrant.getLevel1MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel1MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-
-				//减量
-				AwardStock fAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getFromMerchantId(), jsonObject.getString("level2MaterialId"));
-				if(fAwardStock==null) {
-					fAwardStock=new AwardStock();
-					fAwardStock.setMerchantId(awardGrant.getFromMerchantId());
-					fAwardStock.setAwardMaterialId(jsonObject.getString("level2MaterialId"));
-					fAwardStock.setStockNumber(0);
-					fAwardStock.setUseNumber(0);
-				}
-				fAwardStock.setStockNumber(fAwardStock.getStockNumber()-jsonObject.getIntValue("level2Num"));
-				awardStocks.add(fAwardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level2MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level2Num"));
-				awardConsume.setType(1);
-				awardConsume.setRemarks("我向下配送");
-				awardConsumes.add(awardConsume);
-				
-				//增量
-				AwardStock tAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getToMerchantId(), jsonObject.getString("level2MaterialId"));
-				if(tAwardStock==null) {
-					tAwardStock=new AwardStock();
-					tAwardStock.setMerchantId(awardGrant.getToMerchantId());
-					tAwardStock.setAwardMaterialId(jsonObject.getString("level2MaterialId"));
-					tAwardStock.setStockNumber(0);
-					tAwardStock.setUseNumber(0);
-				}
-				tAwardStock.setStockNumber(tAwardStock.getStockNumber()+jsonObject.getIntValue("level2Num"));
-				awardStocks.add(tAwardStock);
-				
-				awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level2MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level2Num"));
-				awardConsume.setType(2);
-				awardConsume.setRemarks("我向下配送");
-				awardConsumes.add(awardConsume);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level3MaterialId"));
-				awardGrantInfo.setLevel(3);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level3Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-			}
-		}
-		
-		if(awardGrant.getLevel1MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel1MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-			
-				//减量
-				AwardStock fAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getFromMerchantId(), jsonObject.getString("level3MaterialId"));
-				if(fAwardStock==null) {
-					fAwardStock=new AwardStock();
-					fAwardStock.setMerchantId(awardGrant.getFromMerchantId());
-					fAwardStock.setAwardMaterialId(jsonObject.getString("level3MaterialId"));
-					fAwardStock.setStockNumber(0);
-					fAwardStock.setUseNumber(0);
-				}
-				fAwardStock.setStockNumber(fAwardStock.getStockNumber()-jsonObject.getIntValue("level3Num"));
-				awardStocks.add(fAwardStock);
-				
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level3MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level3Num"));
-				awardConsume.setType(1);
-				awardConsume.setRemarks("我向下配送");
-				awardConsumes.add(awardConsume);
-				
-				//增量
-				AwardStock tAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getToMerchantId(), jsonObject.getString("level3MaterialId"));
-				if(tAwardStock==null) {
-					tAwardStock=new AwardStock();
-					tAwardStock.setMerchantId(awardGrant.getToMerchantId());
-					tAwardStock.setAwardMaterialId(jsonObject.getString("level3MaterialId"));
-					tAwardStock.setStockNumber(0);
-					tAwardStock.setUseNumber(0);
-				}
-				tAwardStock.setStockNumber(tAwardStock.getStockNumber()+jsonObject.getIntValue("level3Num"));
-				awardStocks.add(tAwardStock);
-				
-				awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-				awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-				awardConsume.setAwardMaterialId(jsonObject.getString("level3MaterialId"));
-				awardConsume.setNumber(jsonObject.getIntValue("level3Num"));
-				awardConsume.setType(2);
-				awardConsume.setRemarks("上级向我配送");
-				awardConsumes.add(awardConsume);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level3MaterialId"));
-				awardGrantInfo.setLevel(3);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level3Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-				
-			}
-		}
-		
-		awardGrant=this.save(awardGrant);
-		for (AwardGrantInfo awardGrantInfo : awardGrantInfos) {
-			awardGrantInfo.setGrantId(awardGrant.getId());
-		}
-		awardStockService.save(awardStocks);
-		awardConsumeService.saveAwardConsumeLog(awardConsumes);
-		return true;
-	}
-
-
-	@Override
-	public boolean addAwardGrantAndAwardStockBySSJFX(AwardGrant awardGrant) {
-		List<AwardMaterial> awardMaterials=new ArrayList<AwardMaterial>();
-		List<AwardGrantInfo> awardGrantInfos=new ArrayList<AwardGrantInfo>();
-		
-		//指点商户的处理库存数
-		if(awardGrant.getLevel1MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel1MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-				
-				//减量
-				AwardMaterial awardMaterial=awardMaterialService.getById(jsonObject.getString("level1MaterialId"));
-				if(awardMaterial.getStockNumber()<jsonObject.getIntValue("level1Num")) {
-					return false;
-				}
-				awardMaterial.setStockNumber(awardMaterial.getStockNumber()-jsonObject.getIntValue("level1Num"));
-				awardMaterial.setLockNumber(awardMaterial.getLockNumber()+jsonObject.getIntValue("level1Num"));
-				awardMaterials.add(awardMaterial);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level1MaterialId"));
-				awardGrantInfo.setLevel(1);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level1Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-			}
-		}
-		
-		if(awardGrant.getLevel2MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel2MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-				
-				//减量
-				AwardMaterial awardMaterial=awardMaterialService.getById(jsonObject.getString("level2MaterialId"));
-				if(awardMaterial.getStockNumber()<jsonObject.getIntValue("level2Num")) {
-					return false;
-				}
-				awardMaterial.setStockNumber(awardMaterial.getStockNumber()-jsonObject.getIntValue("level2Num"));
-				awardMaterial.setLockNumber(awardMaterial.getLockNumber()+jsonObject.getIntValue("level2Num"));
-				awardMaterials.add(awardMaterial);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level2MaterialId"));
-				awardGrantInfo.setLevel(2);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level2Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-			}
-
-		}
-		
-		if(awardGrant.getLevel3MaterialIdJson()!=null) {
-			JSONArray jsonArray=awardGrant.getLevel3MaterialIdJson();
-			for (Object object : jsonArray) {
-				JSONObject jsonObject=(JSONObject)object;
-				
-				//减量
-				AwardMaterial awardMaterial=awardMaterialService.getById(jsonObject.getString("level3MaterialId"));
-				if(awardMaterial.getStockNumber()<jsonObject.getIntValue("level3Num")) {
-					return false;
-				}
-				awardMaterial.setStockNumber(awardMaterial.getStockNumber()-jsonObject.getIntValue("level3Num"));
-				awardMaterial.setLockNumber(awardMaterial.getLockNumber()+jsonObject.getIntValue("level3Num"));
-				awardMaterials.add(awardMaterial);
-				
-				AwardGrantInfo awardGrantInfo=new AwardGrantInfo();
-				awardGrantInfo.setGrantId(awardGrant.getId());
-				awardGrantInfo.setMaterialId(jsonObject.getString("level3MaterialId"));
-				awardGrantInfo.setLevel(3);
-				awardGrantInfo.setNum(jsonObject.getIntValue("level3Num"));
-				awardGrantInfo.setCreateTime(new Date());
-				awardGrantInfos.add(awardGrantInfo);
-			}
-		}
-		
-		awardGrant=this.save(awardGrant);
-		for (AwardGrantInfo awardGrantInfo : awardGrantInfos) {
-			awardGrantInfo.setGrantId(awardGrant.getId());
-		}
-		awardGrantInfoService.save(awardGrantInfos);
-		awardMaterialService.save(awardMaterials);
-		return true;
-	}
-
-
-	@Override
-	public boolean updateAwardGrantByStatus(AwardGrant awardGrant, Integer status) {
-		List<AwardStock> awardStocks=new ArrayList<AwardStock>();
-		List<AwardMaterial> awardMaterials=new ArrayList<AwardMaterial>();
-		List<AwardConsume> awardConsumes=new ArrayList<AwardConsume>();
-		List<AwardGrantInfo> awardGrantInfos= awardGrantInfoService.findAwardGrantInfoByGrantId(awardGrant.getId());
-		
-		switch (status) {
-			case 0://取消，解锁锁定的库存，返回总库存中
-				if(awardGrant.getStatus()==0) {break;}
-				
-				for (AwardGrantInfo awardGrantInfo : awardGrantInfos) {
-					//返量
-					AwardMaterial awardMaterial=awardMaterialService.getById(awardGrantInfo.getMaterialId());
-					
-					awardMaterial.setStockNumber(awardMaterial.getStockNumber()+awardGrantInfo.getNum());
-					awardMaterial.setLockNumber(awardMaterial.getLockNumber()-awardGrantInfo.getNum());
-					awardMaterials.add(awardMaterial);
-				}
-				
-				break;
-			case 1://已通过，解锁锁定的库存，添加到使用库存中,添加到商户的总库存中
-				//if(awardGrant.getStatus()==1) {break;}
-				
-
-				for (AwardGrantInfo awardGrantInfo : awardGrantInfos) {
-					//减量
-					AwardMaterial awardMaterial=awardMaterialService.getById(awardGrantInfo.getMaterialId());
-					
-					awardMaterial.setLockNumber(awardMaterial.getLockNumber()-awardGrantInfo.getNum());
-					awardMaterial.setUseNumber(awardMaterial.getUseNumber()+awardGrantInfo.getNum());
-					awardMaterials.add(awardMaterial);
-					
-					AwardConsume awardConsume=new AwardConsume();
-					awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-					awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-					awardConsume.setAwardMaterialId(awardGrantInfo.getMaterialId());
-					awardConsume.setNumber(awardGrantInfo.getNum());
-					awardConsume.setType(1);
-					awardConsume.setRemarks("我向下配送");
-					awardConsumes.add(awardConsume);
-					
-					//增量
-					AwardStock tAwardStock=awardStockService.getAwardStockByMaterialId(awardGrant.getToMerchantId(), awardGrantInfo.getMaterialId());
-					if(tAwardStock==null) {
-						tAwardStock=new AwardStock();
-						tAwardStock.setMerchantId(awardGrant.getToMerchantId());
-						tAwardStock.setAwardMaterialId(awardGrantInfo.getMaterialId());
-						tAwardStock.setStockNumber(0);
-						tAwardStock.setUseNumber(0);
-					}
-					tAwardStock.setStockNumber(tAwardStock.getStockNumber()+awardGrantInfo.getNum());
-					awardStocks.add(tAwardStock);
-					
-					awardConsume=new AwardConsume();
-					awardConsume.setFromMerchantId(awardGrant.getFromMerchantId());
-					awardConsume.setToMerchantId(awardGrant.getToMerchantId());
-					awardConsume.setAwardMaterialId(awardGrantInfo.getMaterialId());
-					awardConsume.setNumber(awardGrantInfo.getNum());
-					awardConsume.setType(2);
-					awardConsume.setRemarks("上级向我配送");
-					awardConsumes.add(awardConsume);
-					
-				}
-				
-				break;
-			case 2://审核中
-				if(awardGrant.getStatus()==1) {break;}
-				
-				break;
-			case 3://审核不通过，解锁锁定的库存，添加到使用库存中
-				if(awardGrant.getStatus()==3) {break;}
-				
-				for (AwardGrantInfo awardGrantInfo : awardGrantInfos) {
-					//返量
-					AwardMaterial awardMaterial=awardMaterialService.getById(awardGrantInfo.getMaterialId());
-					
-					awardMaterial.setStockNumber(awardMaterial.getStockNumber()+awardGrantInfo.getNum());
-					awardMaterial.setLockNumber(awardMaterial.getLockNumber()-awardGrantInfo.getNum());
-					awardMaterials.add(awardMaterial);
-				}
-				
-				break;
-			default:
-				break;
-		}
-		awardGrant.setStatus(status);
-		awardGrant.setUpdateTime(new Date());
-		this.save(awardGrant);
-		awardMaterialService.save(awardMaterials);
-		awardStockService.save(awardStocks);
-		awardConsumeService.saveAwardConsumeLog(awardConsumes);
-		return false;
-	}
-
-
-
-	
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardGrantServiceInfoImpl.java

@@ -1,49 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ssj.bean.sys.award.domain.AwardGrantInfo;
-import com.ssj.dao.sys.award.dao.AwardGrantInfoDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardGrantInfoService;
-
-@Service
-@Transactional
-public class AwardGrantServiceInfoImpl extends BaseServiceImpl<AwardGrantInfo, String> implements AwardGrantInfoService {
-	
-	@Autowired
-	private AwardGrantInfoDao  awardGrantInfoDao;
-
-	@Autowired
-	private AwardQueryDao  queryDao;
-	
-	@Override
-	public PagingAndSortingRepository<AwardGrantInfo, String> getDao() {
-		return awardGrantInfoDao;
-	}
-
-	@Override
-	public List<AwardGrantInfo> findAwardGrantInfoByGrantId(String grantId) {
-		return awardGrantInfoDao.findAwardGrantInfoByGrantId(grantId);
-	}
-
-	@Override
-	public Page<Map<String, Object>> findAwardGrantInfoByGrantId(Map<String, Object> searchParams, Pageable pageable) {
-		return queryDao.findAwardGrantInfoByGrantId(searchParams, pageable);
-	}
-
-
-
-
-
-	
-}

src/main/java/com/ssj/service/sys/award/service/impl/AwardMaterialServiceImpl.java

@@ -1,10 +1,9 @@
 package com.ssj.service.sys.award.service.impl;
 
-import com.ssj.bean.sys.award.domain.AwardMaterial;
-import com.ssj.dao.sys.award.dao.AwardMaterialDao;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardMaterialService;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -12,8 +11,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.Map;
+import com.ssj.bean.sys.award.domain.AwardMaterial;
+import com.ssj.dao.sys.award.dao.AwardMaterialDao;
+import com.ssj.dao.sys.award.dao.AwardQueryDao;
+import com.ssj.framework.core.common.service.BaseServiceImpl;
+import com.ssj.service.sys.award.service.AwardMaterialService;
+import com.ssj.service.sys.award.service.AwardSncodeService;
 
 @Service
 @Transactional
@@ -25,6 +28,8 @@ public class AwardMaterialServiceImpl extends BaseServiceImpl<AwardMaterial, Str
 	@Autowired
 	private AwardQueryDao  queryDao;
 
+	@Autowired
+	private AwardSncodeService  awardSncodeService;
 
 	@Override
 	public PagingAndSortingRepository<AwardMaterial, String> getDao() {
@@ -46,5 +51,18 @@ public class AwardMaterialServiceImpl extends BaseServiceImpl<AwardMaterial, Str
 		return awardMaterialDao.getAwardMaterialById(id);
 	}
 
+	@Override
+	@Transactional
+	public AwardMaterial addNumberAndSnCode(String id, Integer number) {
+		AwardMaterial awardMaterial = this.getById(id);
+		awardMaterial.setStockNumber((awardMaterial.getStockNumber()==null?0:awardMaterial.getStockNumber())+number);
+		awardMaterial.setUpdateTime(new Date());
+		this.save(awardMaterial);
+		
+		awardSncodeService.createAwardSncodeByCode(awardMaterial,number);
+		
+		return awardMaterial;
+	}
+
 	
 }

src/main/java/com/ssj/service/sys/award/service/impl/AwardSncodeServiceImpl.java

@@ -1,14 +1,10 @@
 package com.ssj.service.sys.award.service.impl;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -16,25 +12,13 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.alibaba.fastjson.JSONObject;
-import com.ssj.bean.sys.award.domain.AwardActivity;
-import com.ssj.bean.sys.award.domain.AwardActivityInfo;
-import com.ssj.bean.sys.award.domain.AwardConsume;
+import com.ssj.bean.sys.award.domain.AwardMaterial;
 import com.ssj.bean.sys.award.domain.AwardSncode;
-import com.ssj.bean.sys.award.domain.AwardStock;
-import com.ssj.bean.sys.fx.domain.Merchant;
 import com.ssj.dao.sys.award.dao.AwardQueryDao;
 import com.ssj.dao.sys.award.dao.AwardSncodeDao;
 import com.ssj.framework.basic.utils.DateHelper;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.framework.core.util.RedisUtil;
-import com.ssj.service.conch.conch.service.HomeworkRankingService;
-import com.ssj.service.sys.award.service.AwardActivityInfoService;
-import com.ssj.service.sys.award.service.AwardActivityService;
-import com.ssj.service.sys.award.service.AwardConsumeService;
 import com.ssj.service.sys.award.service.AwardSncodeService;
-import com.ssj.service.sys.award.service.AwardStockService;
-import com.ssj.service.sys.fx.service.MerchantService;
 import com.ssj.service.task.SyncCreateQrSnCodeTask;
 import com.ssj.taskthread.ThreadPool;
 
@@ -42,246 +26,51 @@ import com.ssj.taskthread.ThreadPool;
 @Transactional
 public class AwardSncodeServiceImpl extends BaseServiceImpl<AwardSncode, String> implements AwardSncodeService {
 	
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-	
 	@Autowired
 	private AwardSncodeDao  awardSncodeDao;
 
 	@Autowired
 	private AwardQueryDao  queryDao;
 	
-	@Autowired
-	private AwardStockService  awardStockService;
-	
-	@Autowired
-	private AwardConsumeService  awardConsumeService;
-
-	@Autowired
-	private AwardActivityService  awardActivityService;
-	
-	@Autowired
-	private HomeworkRankingService  homeworkRankingService;
-	
-	@Autowired
-	private MerchantService  merchantService;
-	
-	@Autowired
-	private AwardActivityInfoService  awardActivityInfoService;
-	
-	@Autowired
-    private RedisUtil redisUtil;
-	
-    public static String FALSE_SNCODE="FALSE_SNCODE_";
-	
 	@Override
 	public Page<Map<String, Object>> findAwardSncodeBylist(Map<String, Object> searchParams, Pageable pageable) {
 		return queryDao.findAwardSncodeBylist(searchParams, pageable);
 	}
-
 	
 	@Override
 	public PagingAndSortingRepository<AwardSncode, String> getDao() {
 		return awardSncodeDao;
 	}
-
-	@Override
-	public List<AwardSncode> findAwardSncodeByAwardActivityId(String awardActivityId, Integer status) {
-		return awardSncodeDao.findAwardSncodeByAwardActivityId(awardActivityId, status);
-	}
-
-
-	@Override
-	public List<AwardSncode> findAwardSncodeByAwardMaterialId(String awardActivityId, String awardMaterialId,Integer status) {
-		return awardSncodeDao.findAwardSncodeByAwardMaterialId(awardActivityId, awardMaterialId, status);
-	}
-	
 	
 	@Override
-	public synchronized void createAwardSncodeByCode(AwardActivity awardActivity) {
-		//已经生成过code的活动，不能再生成。
-		List<AwardSncode> aAwardSncodes=awardSncodeDao.findAwardSncodeByAwardActivityId(awardActivity.getId());
-		if(aAwardSncodes!=null && aAwardSncodes.size()>0) {
-			return ;
-		}
-		List<AwardActivityInfo> awardActivityInfos=awardActivityInfoService.findAwardActivityInfoByActivityId(awardActivity.getId());
-		Merchant merchant= merchantService.getById(awardActivity.getMerchantId());
+	public synchronized void createAwardSncodeByCode(AwardMaterial awardMaterial,Integer num) {
 		List<AwardSncode> awardSncodes=new ArrayList<AwardSncode>();
 		AwardSncode awardSncode=null;
-		
-		for (AwardActivityInfo awardActivityInfo : awardActivityInfos) {
+		for (int i = 1; i <= num; i++) {
 			awardSncode=new AwardSncode();
-			awardSncode.setAwardActivityId(awardActivity.getId());
-			awardSncode.setAwardMaterialId(awardActivityInfo.getMaterialId());
-			awardSncode.setSnCode(DateHelper.getOrderNo(5)+(awardActivityInfos.indexOf(awardActivityInfo)+1));
-			awardSncode.setLibId(merchant.getLibId());
-			//awardSncode.setSnImg(createQrCode(awardSncode.getSnCode()));
+			awardSncode.setAwardMaterialId(awardMaterial.getId());
+			awardSncode.setSnCode(DateHelper.getOrderNo(5)+i);
 			awardSncode.setStatus(0);
 			awardSncode.setCreateTime(new Date());
 			awardSncodes.add(awardSncode);
 		}
-		
 		//保存兑换码
 		this.save(awardSncodes);
-		//加载兑换码到redis
-		this.loadAwardSncodeToRedisByActivityId(awardActivity.getId());
 		//生成兑换码图片
 		ThreadPool.getInstance().addTask(new SyncCreateQrSnCodeTask(awardSncodes));
 	}
 	
-	@Override
-	public synchronized void cleanAwardSncodeByCode(AwardActivity awardActivity) {
-		List<AwardStock> awardStocks=new ArrayList<AwardStock>();
-		List<AwardConsume> awardConsumes=new ArrayList<AwardConsume>();
-		List<AwardSncode> statusAwardSncodes=new ArrayList<AwardSncode>();
-		
-		List<AwardActivityInfo> awardActivityInfos=awardActivityInfoService.findAwardActivityInfoByActivityId(awardActivity.getId());
-		
-		for (AwardActivityInfo awardActivityInfo : awardActivityInfos) {
-			
-			List<AwardSncode> awardSncodes=this.findAwardSncodeByAwardMaterialId(awardActivity.getId(), awardActivityInfo.getMaterialId(), 0);
-			if(awardSncodes!=null && awardSncodes.size()>0) {
-				for (AwardSncode awardSncode : awardSncodes) {
-					awardSncode.setStatus(5);
-					awardSncode.setUpdateTime(new Date());
-					statusAwardSncodes.add(awardSncode);
-				}
-				AwardStock awardStock=awardStockService.getAwardStockByMaterialId(awardActivity.getMerchantId(), awardActivityInfo.getMaterialId());
-				awardStock.setStockNumber(awardStock.getStockNumber()+awardSncodes.size());
-				awardStocks.add(awardStock);
-
-				AwardConsume awardConsume=new AwardConsume();
-				awardConsume.setFromMerchantId(awardActivity.getMerchantId());
-				awardConsume.setToMerchantId(null);
-				awardConsume.setAwardMaterialId(awardActivityInfo.getMaterialId());
-				awardConsume.setNumber(awardSncodes.size());
-				awardConsume.setType(5);
-				awardConsume.setRemarks("取消活动返回库存量");
-				awardConsumes.add(awardConsume);
-				
-			}
-		}
-		
-		this.save(statusAwardSncodes);
-		awardStockService.save(awardStocks);
-		awardConsumeService.saveAwardConsumeLog(awardConsumes);
-	}
-
-
-	@Override
-	public AwardSncode randomAwardSncodeByActivityIdAndMaterialId(String awardActivityId, String materialId) {
-		return awardSncodeDao.randomAwardSncodeByActivityIdAndMaterialId(awardActivityId, materialId);
-	}
 	
 	@Override
 	public Page<Map<String, Object>> findAwardSncodeByVipList(Map<String, Object> searchParams, Pageable pageable) {
 		return queryDao.findAwardSncodeByVipList(searchParams, pageable);
 	}
 
-
-	@Override
-	public AwardSncode getAwardSncodeBySnCode(String snCode) {
-		return awardSncodeDao.getAwardSncodeBySnCode(snCode);
-	}
-
-
-	@Override
-	public boolean loadAwardSncodeToRedisByActivityId(String awardActivityId) {
-		logger.info("抽奖活动数据加载Redis，活动ID："+awardActivityId);
-		if(redisUtil.exists(awardActivityId)) {
-			return true;
-		}
-		List<String> redisList=new ArrayList<String>();
-		AwardActivity awardActivity=awardActivityService.getById(awardActivityId);
-		List<AwardSncode> awardSncodes=awardSncodeDao.findAwardSncodeByAwardActivityId(awardActivity.getId());
-		for (AwardSncode awardSncode : awardSncodes) {
-			redisList.add(awardSncode.getSnCode());
-		}
-		Integer count=awardActivity.getPartakeNum()-awardSncodes.size();
-		if(count>0) {
-			for (int i = 1; i <=count; i++) {
-				redisList.add(FALSE_SNCODE+i);
-			}
-		}
-		//打乱集合的排序，放到redis中，为了保证数据更乱，三次打乱集合。
-		Collections.shuffle(redisList);
-		Collections.shuffle(redisList);
-		Collections.shuffle(redisList);
-		
-		String[] sncodeList = redisList.toArray(new String[redisList.size()]); 
-		redisUtil.sadd(awardActivityId, redisList.toArray(sncodeList));
-		logger.info("抽奖活动数据加载Redis，活动ID："+awardActivityId);
-		logger.info("抽奖活动数据加载Redis，奖码列表："+String.join(",",sncodeList));
-		awardActivity.setIsRedis(1);
-		awardActivityService.save(awardActivity);
-		return true;
-	}
-
-
-	@Override
-	public synchronized AwardSncode randomAwardSncodeRedisByActivityId(String awardActivityId) {
-		logger.info("抽奖中，活动ID："+awardActivityId);
-		if(!redisUtil.exists(awardActivityId)) {
-			logger.info("抽奖中，Redis中未生成奖品码，开始生成奖品码，活动ID："+awardActivityId);
-			loadAwardSncodeToRedisByActivityId(awardActivityId);
-			logger.info("抽奖中，Redis中未生成奖品码，生成奖品码成功，活动ID："+awardActivityId);
-		}
-		String snCode=redisUtil.spop(awardActivityId);
-		logger.info("抽奖中，Redis中返回奖品码，奖品码："+(snCode==null ? "": snCode)+"，活动ID："+awardActivityId);
-		if(StringUtils.isNotEmpty(snCode) && !snCode.startsWith(FALSE_SNCODE)) {
-			AwardSncode awardSncode=this.getAwardSncodeBySnCode(snCode);
-			if(awardSncode!=null && awardSncode.getStatus()==0) {
-				logger.info("抽奖中，Redis中返回奖品码，奖品码有效返回，活动ID："+awardActivityId);
-				return awardSncode;
-			}
-		}
-		return null;
-	}
-
-
-	@Override
-	public AwardSncode awardSncodeByActivityId(String userId,String vipId,String awardActivityId) {
-		//为了保证数据同步,抽奖前一步再查一次积分,不足的, 返回未中奖
-		Integer integral=homeworkRankingService.searchIntegralByVipId(vipId);
-		if(integral<200) {
-			return null;
-		}
-		
-		//减量积分
-        homeworkRankingService.saveRankIntegral(vipId, -200, 9, vipId);
-        
-		AwardSncode awardSncode=randomAwardSncodeRedisByActivityId(awardActivityId);
-		if(awardSncode!=null) {
-			logger.info("抽奖中，中奖啦，vipId："+(vipId==null?"":vipId)+"，活动ID："+awardActivityId);
-			awardSncode.setUserId(userId);
-			awardSncode.setStatus(1);
-			awardSncode.setType(1);
-			awardSncode.setVipId(vipId);
-			awardSncode.setDrawTime(new Date());
-			awardSncode.setUpdateTime(new Date());
-			this.save(awardSncode);
-			return awardSncode;
-		}
-		logger.info("抽奖中，未中奖...，vipId："+(vipId==null?"":vipId)+"，活动ID："+awardActivityId);
-		return null;
-	}
-
-
-	@Override
-	public void cleanAwardSncodeResisByCode(String awardActivityId, String snCode) {
-		redisUtil.srem(awardActivityId, snCode);
-	}
-
-
+	
 	@Override
 	public void updateSnCodeImgBySnCode(String snCode, String snCodeImg) {
 		awardSncodeDao.updateSnCodeImgBySnCode(snCode, snCodeImg);
 	}
 
 
-	
-
-	
-
-	
-
 }

src/main/java/com/ssj/service/sys/award/service/impl/AwardStockServiceImpl.java

@@ -1,83 +0,0 @@
-package com.ssj.service.sys.award.service.impl;
-
-import com.ssj.bean.sys.award.domain.AwardMaterial;
-import com.ssj.bean.sys.award.domain.AwardStock;
-import com.ssj.bean.sys.fx.domain.Merchant;
-import com.ssj.dao.sys.award.dao.AwardQueryDao;
-import com.ssj.dao.sys.award.dao.AwardStockDao;
-import com.ssj.framework.core.common.service.BaseServiceImpl;
-import com.ssj.service.sys.award.service.AwardMaterialService;
-import com.ssj.service.sys.award.service.AwardStockService;
-import com.ssj.service.sys.fx.service.MerchantService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Map;
-
-@Service
-@Transactional
-public class AwardStockServiceImpl extends BaseServiceImpl<AwardStock, String> implements AwardStockService {
-	
-	@Autowired
-	private AwardStockDao  awardStockDao;
-
-	@Autowired
-	private AwardQueryDao  queryDao;
-	
-	@Autowired
-	private MerchantService merchantService;
-	
-	@Autowired
-	private AwardMaterialService awardMaterialService;
-	
-
-	@Override
-	public PagingAndSortingRepository<AwardStock, String> getDao() {
-		return awardStockDao;
-	}
-
-
-	@Override
-	public AwardStock getAwardStockByMaterialId(String merchantId, String awardMaterialId) {
-		return awardStockDao.getAwardStockByMaterialId(merchantId, awardMaterialId);
-	}
-
-	
-	//得到商户下的奖品库存
-	@Override
-	public Integer getStockNumByMerchantIdAndLevelMaterialId(String merchantId, String levelMaterialId) {
-		 Integer stock=0;
-		 if(StringUtils.isNotEmpty(merchantId) && StringUtils.isNotEmpty(levelMaterialId)) {
-			 Merchant merchant=merchantService.getById(merchantId);
-			 //当前商户是SSJ-FX商户,查询的是指点下的奖品库存。
-			 if("SSJ-FX".equals(merchant.getOrgCode())) {
-				 AwardMaterial awardMaterial=awardMaterialService.getAwardMaterialById(levelMaterialId);
-				 if(awardMaterial!=null) {
-					 stock=awardMaterial.getStockNumber();
-				 }
-			 }else {
-				 //查询出该商户奖品下有多少库存
-				 AwardStock awardStock= this.getAwardStockByMaterialId(merchant.getId(), levelMaterialId);
-				 if(awardStock!=null) {
-					 stock=awardStock.getStockNumber();
-				 }
-			 }
-		 }
-		 return stock;
-	}
-
-
-	@Override
-	public Page<Map<String, Object>> findAwardStockBylist(Map<String, Object> searchParams, Pageable pageable) {
-		return queryDao.findAwardStockBylist(searchParams, pageable);
-	}
-
-
-
-	
-}

src/main/java/com/ssj/service/weixin/push/service/impl/PushTemplateServiceImpl.java

@@ -118,7 +118,7 @@ public class PushTemplateServiceImpl  extends BaseServiceImpl<PushTemplate, Stri
 	@Override
 	public void pushWxTemplate() {
 		List<PushTemplate> TempList =dao.getPushWxTemplateStat();
-		logger.info("3分钟微信推送任务开始，本次任务推送量为："+TempList.size());
+		logger.info("定时微信推送任务开始，推送任务量为："+TempList.size());
 		int errorNum=0;
 		for (PushTemplate pushTemplate : TempList) {
 			try{
@@ -189,7 +189,7 @@ public class PushTemplateServiceImpl  extends BaseServiceImpl<PushTemplate, Stri
 				logger.error(pushTemplate.getWxTplSid()+"3分钟微信推送任务结束，推送异常...");
 			}
 		}
-		logger.info("3分钟微信推送任务结束，本次任务推送量为："+TempList.size()+",成功量："+(TempList.size()-errorNum)+"失败量："+errorNum);
+		logger.info("定时微信推送任务结束，推送任务量为："+TempList.size()+",\t成功量："+(TempList.size()-errorNum)+",\t失败量："+errorNum);
 	}
 
 	@Override

src/main/java/com/ssj/service/weixin/sales/service/impl/LibVipServiceServiceImpl.java

@@ -1819,7 +1819,7 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 		String accessKey="Zhidian@34889_";
 		
 		String accessToken=createOpenToken(appid, accessKey);
-		String url="https://master.sharingschool.com/open/api/parents/share/dealServiceCRM?appid="+appid+"&accessToken="+accessToken;
+		String url=host+"/api/parents/share/dealServiceCRM?appid="+appid+"&accessToken="+accessToken;
 		
 		JSONObject json=new JSONObject();
 		json.put("type", type);

src/main/resources/templates/sys/award/activity/edit.html

@@ -1,388 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/city.json.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/citySetMe_V.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/Popt.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-</head>
- <style type="text/css">
-   body{min-width:180px;}
-       .select1{
-   		    width:100%;
-		    height: 32px;
-		    line-height: 32px;
-		    border-top: solid 1px #a7b5bc;
-		    border-left: solid 1px #a7b5bc;
-		    border-right: solid 1px #ced9df;
-		    border-bottom: solid 1px #ced9df;
-		    opacity:1;
-	        margin-bottom: 10px;
-    	}
-    	.btn{
-    	  width: 100px;
-    	}
-     label.control-label-error {color: Red;}	
-     
-._citys {     background-color: whitesmoke;width: 450px; display: inline-block; border: 2px solid #eee; padding: 5px; position: relative; }
-._citys span { color: #05920a; height: 15px; width: 15px; line-height: 15px; text-align: center; border-radius: 3px; position: absolute; right: 10px; top: 10px; border: 1px solid #05920a; cursor: pointer; }
-._citys0 { width: 95%; height: 34px; line-height: 34px; display: inline-block; border-bottom: 2px solid #05920a; padding: 0px 5px; font-size:14px; font-weight:bold; margin-left:6px; }
-._citys0 li { display: inline-block; line-height: 34px; font-size: 15px; color: #888; width: 80px; text-align: center; cursor: pointer; }
-._citys1 { width: 100%; display: inline-block; padding: 10px 0; }
-._citys1 a { width: 83px; height: 35px; display: inline-block; background-color: #f5f5f5; color: #666; margin-left: 6px; margin-top: 3px; line-height: 35px; text-align: center; cursor: pointer; font-size: 12px; border-radius: 5px; overflow: hidden; }
-._citys1 a:hover { color: #fff; background-color: #05920a; }
-.AreaS { background-color: #05920a !important; color: #fff !important; }
-#school{
-	margin-left: 110px;
-	padding-bottom: 10px;
-}  
-#school span{
-  	min-width: 25%;
-    float: left;
-    margin-bottom: 10px;
-}
-.joinseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}
-
-.schoolseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}    
-
-dtext{
-	color: red;
-	cursor: pointer;
-}
-.forminfo li label{
-	text-align: right;
-	padding-right: 10px
-}
-  
-</style>
-<body>
-<div class="formbody">
-		<ul class="forminfo">
-			<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${awardActivity.id}"/>
-			<input type="hidden" id="status" class="dfinput fl" name="status" th:value="${awardActivity.status}"/>
-			
-			<li>
-				<label>商户名称<b>*</b></label>
-				<div class="vocation" style="margin-right: 5px; width: 345px">
-					<select name="merchantId" id="merchantId" class="select1" > 
-						<option th:each="item:${subMerchants}" th:selected="${item.id eq awardActivity.merchantId  ? true : false}"  th:data-portnum="${item.portNum}"  th:value="${item.id}" th:text="${item.unitName}+' ['+${item.posCode}+']'"></option>
-					</select>
-				</div>
-			</li>
-			
-			<li>
-				<label>端口数量：<b>*</b></label>
-				<input disabled="disabled" onblur="refreshRate()" type="number" id="portNum" class="dfinput fl" name="portNum" th:value="${awardActivity.portNum!=null ? awardActivity.portNum : 0}"/>
-			</li>
-			
-			<li>
-				<label>预计人数：<b>*</b></label>
-				<input onblur="refreshRate()" type="number" id="partakeNum" class="dfinput fl" name="title" th:value="${awardActivity.partakeNum!=null ? awardActivity.partakeNum : 0}"/>
-			</li>
-
-			<li>
-				<label>活动主题：<b>*</b></label>
-				<input type="text" id="title" class="dfinput fl" name="title" th:value="${awardActivity.title}"/>
-			</li>
-			
-			<li>
-				<label>一等奖<b>*</b></label>
-				<div class="vocation" style="margin-right: 5px; width: 200px">
-					<select name="level1MaterialId" id="level1MaterialId" class="select1 level1MaterialId" > 
-						<option value="">选择奖品</option>
-						<option th:each="item:${level1Materials}"   th:value="${item.id}" th:text="${item.name}"></option>
-					</select>
-				</div>
-				<input onChange="refreshRate()" style="width: 95px;" type="number" id="level1Num" class="dfinput fl" name="level1Num" th:value="${awardActivity.level1Num!=null ? awardActivity.level1Num : 0}"/>
-				<text>
-					&nbsp;
-					库存:<t id="level1_num" style="color:red">0</t>
-<!-- 					&nbsp; -->
-<!-- 					中奖率:<t id="level1_num_rate" style="color:red">0%</t> -->
-				</text>
-			</li>
-			
-			<li>
-				<label>二等奖<b></b></label>
-				<div class="vocation" style="margin-right: 5px; width: 200px">
-					<select name="level2MaterialId" id="level2MaterialId" class="select1 level2MaterialId" >
-						<option value="">选择奖品</option> 
-						<option th:each="item:${level2Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-					</select>
-				</div>
-				<input onChange="refreshRate()" style="width: 95px;" type="number" id="level2Num" class="dfinput fl" name="level2Num" th:value="${awardActivity.level2Num!=null ? awardActivity.level2Num : 0}"/>
-				<text>
-					&nbsp;
-					库存:<t id="level2_num" style="color:red">0</t>
-<!-- 					&nbsp; -->
-<!-- 					中奖率:<t id="level2_num_rate" style="color:red">0%</t> -->
-				</text>
-			</li>
-			
-			<div id="level3MaterialDiv">
-				<li>
-					<label>三等奖<b></b></label>
-					<div class="vocation" style="margin-right: 5px; width: 200px">
-						<select name="level3MaterialId"  class="select1 level3MaterialId" > 
-							<option value="">选择奖品</option>
-							<option th:each="item:${level3Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-						</select>
-					</div>
-					<input onChange="refreshRate()" style="width: 95px;" type="number" class="dfinput fl level3Num" name="level3Num" th:value="${awardActivity.level3Num!=null ? awardActivity.level3Num : 0}"/>
-					<text>
-						&nbsp;
-						库存:<t class="level_num" style="color:red">0</t>
-					</text>
-				</li>
-				
-				<li>
-					<label>&nbsp;<b></b></label>
-					<text style="font-weight: bold;cursor: pointer;color: #056dae;font-size: 14px;" id="addLevel3MaterialHtml">+添加奖品</text>
-				</li>
-			</div>
-			
-			
-			<li>
-				<label>活动备注：<b></b></label>
-				<input type="text" id="remarks" class="dfinput fl" name="title" th:value="${awardActivity.remarks}"/>
-			</li>
-			
-			<li style="margin-bottom:3px">
-				<label>活动底图：<b></b></label>
-				<input type="hidden" id="img" th:data-path="${awardActivity.img}" />
-				<plug id="pluguploadid" th:include="sys/common/imgUpload"  th:inline="javascript"  data-bindelem="#img" th:data-filepaths="${awardActivity.img}"  data-type="1" data-maxnum="2"  \>
-			</li>
-			
-			<li style="padding-top: 20px">
-				<label>&nbsp;</label>
-				<button type="submit" onclick="save();" class="btn">提交</button>
-				<button type="button" class="btn" onclick="closeWin();">取消</button>
-			</li>
-			
-		</ul>
-			
-</div>
-
-<div id="level3MaterialHtml" style="display: none" >
-	<li>
-		<label>三等奖<b></b></label>
-		<div class="vocation" style="margin-right: 5px; width: 200px">
-			<select name="level3MaterialId"  class="select1 level3MaterialId" > 
-				<option value="">选择奖品</option>
-				<option th:each="item:${level3Materials}" th:value="${item.id}" th:text="${item.name}"></option>
-			</select>
-		</div>
-		<input onChange="refreshRate()" style="width: 95px;" type="number" class="dfinput fl level3Num" name="level3Num" th:value="${awardActivity.level3Num!=null ? awardActivity.level3Num : 0}"/>
-		<text>
-			&nbsp;
-			库存:<t class="level_num" style="color:red">0</t>
-			&nbsp;
-			<t class="level_delete" style="color:red;cursor: pointer;">-删除-</t>
-		</text>
-	</li>
-</div>
-
-</body>
-<script type="text/javascript">
-var id='[[${awardActivity.id}]]';
-
-function save(){
-	
-	if($("#portNum").val()<=0){
-		parent.layer.msg("端口数量不能少等于0",{icon:11});
-		return
-	}
-	if($("#partakeNum").val()<=0){
-		parent.layer.msg("预计人数不能少等于0",{icon:11});
-		return
-	}
-	
-	if($("#title").val()==''){
-		parent.layer.msg("活动主题不能为空",{icon:11});
-		return
-	}
-	
-	if($("#level1MaterialId").val()==''  ){
-		parent.layer.msg("请选择奖品",{icon:11});
-		return
-	}
-	
-	var level1MaterialJson=[];
-	var level2MaterialJson=[];
-	var level3MaterialJson=[];
-	
-	if($("#level1MaterialId").val()!=''){
-		if($("#level1Num").val()<=0){
-			parent.layer.msg("一等奖数量不能少等于0",{icon:11});
-			return
-		}
-		if(parseInt($("#level1_num").html())<$("#level1Num").val()){
-			parent.layer.msg("一等奖数量不能大于库存量",{icon:11});
-			return
-		}
-		level1MaterialJson.push({'level1MaterialId':$("#level1MaterialId").val(),'level1Num':$("#level1Num").val()});
-	}
-	
-	if($("#level2MaterialId").val()!=''){
-		if($("#level2Num").val()<=0){
-			parent.layer.msg("二等奖数量不能少等于0",{icon:11});
-			return
-		}
-		if(parseInt($("#level2_num").html())<$("#level2Num").val()){
-			parent.layer.msg("二等奖数量不能大于库存量",{icon:11});
-			return
-		}
-		level2MaterialJson.push({'level2MaterialId':$("#level2MaterialId").val(),'level2Num':$("#level2Num").val()});
-	}
-	
-// 	if($("#level3MaterialId").val()!=''){
-// 		if($("#level3Num").val()<=0){
-// 			parent.layer.msg("三等奖数量不能少等于0",{icon:11});
-// 			return
-// 		}
-// 		if(parseInt($("#level3_num").html())<$("#level3Num").val()){
-// 			parent.layer.msg("三等奖数量不能大于库存量",{icon:11});
-// 			return
-// 		}
-// 	}
-
-	var level3MaterialIds=$("#level3MaterialDiv").find(".level3MaterialId");
-	var level3Nums=$("#level3MaterialDiv").find(".level3Num");
-	var levelNums=$("#level3MaterialDiv").find(".level_num");
-	
-	for (var i = 0; i < level3MaterialIds.length; i++) {
-		if($(level3MaterialIds[i]).val()!=''){
-			if($(level3Nums[i]).val()<=0){
-				parent.layer.msg("三等奖数量不能少等于0",{icon:11});
-				return
-			}
-			if(parseInt($(levelNums[i]).html())<$(level3Nums[i]).val()){
-				parent.layer.msg("三等奖数量不能大于库存量",{icon:11});
-				return
-			}
-			level3MaterialJson.push({'level3MaterialId':$(level3MaterialIds[i]).val(),'level3Num':$(level3Nums[i]).val()});
-		}
-	}
-	
-	
-	parent.layer.confirm("确定保存活动信息?", {
-		icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-	}, function(){
-		var url="[[${sysUrl}]]/sys/award/activity/save";
-		var params ={
-		 	'id' : id,
-            'merchantId' : $("#merchantId").val(),
-            'portNum' : $("#portNum").val(),
-            'partakeNum' : $("#partakeNum").val(),
-            'title' : $("#title").val(),
-            
-            'level1MaterialIds' : JSON.stringify(level1MaterialJson),
-            'level2MaterialIds' : JSON.stringify(level2MaterialJson),
-            'level3MaterialIds' : JSON.stringify(level3MaterialJson),
-            
-            'remarks' : $("#remarks").val(),
-            'img' : $("#img").val()
-        };
-		$.post(url,params,function(data){
-			if(data.meta.success){
-				parent.layer.msg("保存成功",{icon:1});
-				parent.location.reload();
-				parent.layer.close(parent.layer.getFrameIndex(window.name));
-			}else{
-				parent.layer.msg(data.meta.message,{icon:11});
-			}
-		});
-	});
-}
-
-
-function refreshRate(){
-	var portNum=Number($("#partakeNum").val())==0?1:Number($("#partakeNum").val());
-	var level1Num=Number($("#level1Num").val());
-	var level2Num=Number($("#level2Num").val());
-	var level3Num=Number($("#level3Num").val());
-	
-	$("#level1_num_rate").html(new Number((level1Num/portNum*100)).toFixed(3)+"%");
-	$("#level2_num_rate").html(new Number((level2Num/portNum*100)).toFixed(3)+"%");
-	$("#level3_num_rate").html(new Number((level3Num/portNum*100)).toFixed(3)+"%");
-}
-
-
-
-$(function (){
-	
-	 $('#addLevel3MaterialHtml').click(function(){
-		 $(this).parent().before($("#level3MaterialHtml").html());
-	 });
-	
-	 $('#merchantId').change(function(){
-      	var data= $(this).val();
-    	var portnum= $(this).find("option:selected").attr('data-portnum'); 
-      	$("#portNum").val(portnum);       
-   
-      	
-      	var merchantId= $("#merchantId").val();
-    	var levelMaterialId= $("#level1MaterialId").val();
-      	getStock($("#level1_num"),merchantId,levelMaterialId);
-      	
-      	levelMaterialId= $("#level2MaterialId").val();
-      	getStock($("#level2_num"),merchantId,levelMaterialId);
-      	
-      	levelMaterialId= $("#level3MaterialId").val();
-      	getStock($("#level3_num"),merchantId,levelMaterialId);
-      	
-   	 });
-	
-
-	 $('#level1MaterialId').change(function(){
-      	var levelMaterialId= $(this).val();
-      	var merchantId= $("#merchantId").val();
-      	getStock($("#level1_num"),merchantId,levelMaterialId);
-   	 });
-	 
-	 $('#level2MaterialId').change(function(){
-      	var levelMaterialId= $(this).val();
-      	var merchantId= $("#merchantId").val();
-      	getStock($("#level2_num"),merchantId,levelMaterialId);
-   	 });
-	 
-	 $("body").on("change",'.level3MaterialId',function(){
-      	var levelMaterialId= $(this).val();
-    	var merchantId= $("#merchantId").val();
-    	
-      	getStock($(this).parent().parent().find(".level_num"),merchantId,levelMaterialId);
-      	
-   	 });
-			 
-	 $("body").on("click",'.level_delete',function(){
-		 $(this).parent().parent().remove();
-	  });
-	 
-	 function getStock(obj,merchantId,levelMaterialId){
-		 var url="[[${sysUrl}]]/sys/award/grant/stock/get";
-			var params ={'levelMaterialId' : levelMaterialId,'merchantId':merchantId};
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					$(obj).html(data.data.stock);
-					refreshRate();
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-	 }
-	
-		
-})
-
-</script>
-</html>

src/main/resources/templates/sys/award/activity/info.html

@@ -1,134 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">活动奖品明细</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/activity/info.html}" method="post">
-	<input type="hidden" th:value="${search.get('activityId')}" name="activityId" >
-	<ul class="seachform">
-		<li>
-			<label>奖品等级</label>
-			<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option  th:selected="${search.get('level') eq '1' ? true : false}" value="1">一等奖</option>
-				<option  th:selected="${search.get('level') eq '2' ? true : false}" value="2">二等奖</option>
-				<option  th:selected="${search.get('level') eq '3' ? true : false}" value="3">三等奖</option>
-			</select>
-		</li>
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>奖品名称</th>
-				<th>奖品等级</th>
-				<th>奖品数量</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-				<td th:text="${itemStat.count}"></td>
-				<td th:text="${item.get('name')}"></td>
-				<td th:switch="${item.get('level')}">
-				   <span th:case="1" style="color:red">一等奖</span>
-				   <span th:case="2" style="color:red">二等奖</span>
-				   <span th:case="3" style="color:red">三等奖</span>
-				</td>
-			<td th:text="${item.get('num')}"></td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-	
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-
-	function editCardActivity(id){
-		var title="添加活动";
-		if(id!=null && id!='' && id!=undefined){
-			title="编辑活动";
-		}
-		parent.layer.open({
-		    type: 2,
-		    title: title,
-		    closeBtn: 1, //不显示关闭按钮
-		    shift: 0.8,
-		    offset: '100px',
-		    area: ['40%', '70%'],
-		    content: '[[${sysUrl}]]/sys/award/activity/edit.html?id='+id
-		});
-	}
-	
-	
-	function statusCardActivity(id){
-		parent.layer.confirm("确定取消活动?", {
-			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-		}, function(){
-			var url="[[${sysUrl}]]/sys/award/activity/status";
-			var params ={
-			 	'id' : id,
-	            'status' :"0"
-	        };
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					parent.layer.msg("删除成功",{icon:1});
-					parent.location.reload();
-					parent.layer.close(parent.layer.getFrameIndex(window.name));
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-		});
-	}
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/activity/list.html

@@ -1,200 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">我的活动管理</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/activity/list.html}" method="post">
-	<ul class="seachform">
-		
-		<li>
-			<label>我的商户</label>
-			<select class="scinput select_width"  id="merchantId" name="merchantId"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option th:each="item:${subMerchants}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
-			</select>
-		</li>
-	
-		<li>
-			<label>活动主题：</label>
-			<input type="text" id="title" name="title" autocomplete="off"  th:value="${search.get('title')}"  class="scinput date_width" placeholder="活动主题">
-		</li>
-		
-		<li>
-			<label>开始时间</label>
-			<input type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-		</li>
-		<li>
-			<label>结束时间</label>
-			<input type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-		</li>
-		
-		
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-		<li>
-			<ul class="toolbar">
-				<a href="javascript:;" onclick="editCardActivity('')">
-					<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>添加活动</li>
-				</a>
-			</ul>
-		</li>
-		
-		
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>商户名称</th>
-				<th>端口数量</th>
-				<th>活动主题</th>
-				<th>预计参与人数</th>
-				<th>一等奖(名称 / 库存数量)</th>
-		    	<th>二等奖(名称 / 库存数量)</th>
-		    	<th>三等奖(名称 / 库存数量)</th>
-		    	<th>备注</th>
-		    	<th>活动底图</th>
-		    	<th>创建时间</th>
-		    	<th>状态</th>
-		    	<th>抽奖明细</th>
-		        <th>活动记录</th>
-		    	<th>操作</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('unit_name')}"></td>
-					<td th:text="${item.get('port_num')}"></td>
-					<td th:text="${item.get('title')}"></td>
-					<td th:text="${item.get('partake_num')}"></td>
-					<td >
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/activity/info.html(activityId=${item.id},level=1 )}">
-							[[${item.get('level1_num')}]]个
-						</a>
-					</td>
-					<td >
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/activity/info.html(activityId=${item.id},level=2 )}">
-							[[${item.get('level2_num')}]]个
-						</a>
-					</td>
-					<td >
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/activity/info.html(activityId=${item.id},level=3 )}">
-							[[${item.get('level3_num')}]]个
-						</a>
-					</td>
-					<td th:text="${item.get('remarks')}"></td>
-					<td >
-						<img style="height: 40px;" th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}">
-					</td>
-					<td th:text="${item.get('create_time')}"></td>
-					<td th:switch="${item.status}">
-					   <span th:case="0" style="color:red">已取消</span>
-					   <span th:case="1" style="color:red">已发布</span>
-					   <span th:case="2" style="color:red">审核中</span>
-					   <span th:case="3" style="color:red">不通过</span>
-					</td>
-					<td> 
-						<a th:href="${sysUrl+'/sys/award/sncode/list.html?awardActivityId='+item.id }" class="tablelink">奖品明细</a> 
-					</td>
-					<td> 
-						<a th:href="${sysUrl+'/sys/award/activity/log.html?id='+item.id }" class="tablelink">抽奖记录</a> 
-					</td>
-					<td >
-						<a th:if="${item.status==1 || item.status==2}" href="javascript:;" th:onclick="'statusCardActivity(\''+${item.id}+'\',\'0\')'" class="tablelink">取消活动</a> 
-					</td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-	
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-
-	function editCardActivity(id){
-		var title="添加活动";
-		if(id!=null && id!='' && id!=undefined){
-			title="编辑活动";
-		}
-		parent.layer.open({
-		    type: 2,
-		    title: title,
-		    closeBtn: 1, //不显示关闭按钮
-		    shift: 0.8,
-		    offset: '100px',
-		    area: ['800px', '70%'],
-		    content: '[[${sysUrl}]]/sys/award/activity/edit.html?id='+id
-		});
-	}
-	
-	
-	function statusCardActivity(id){
-		parent.layer.confirm("确定取消活动?", {
-			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-		}, function(){
-			var url="[[${sysUrl}]]/sys/award/activity/status";
-			var params ={
-			 	'id' : id,
-	            'status' :"0"
-	        };
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					parent.layer.msg("删除成功",{icon:1});
-					parent.location.reload();
-					parent.layer.close(parent.layer.getFrameIndex(window.name));
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-		});
-	}
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/activity/log.html

@@ -1,150 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">活动抽奖记录，活动ID:[[${param.id}]]</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/activity/log.html}" method="post">
-	<ul class="seachform">
-		<input type="hidden" id="id" name="id" autocomplete="off"  th:value="${search.get('id')}"  >
-		<li>
-			<label>用户姓名：</label>
-			<input type="text" id="name" name="name" autocomplete="off"  th:value="${search.get('name')}"  class="scinput date_width" placeholder="用户姓名">
-		</li>
-		
-		<li>
-			<label>兑换码：</label>
-			<input type="text" id="sncode" name="sncode" autocomplete="off"  th:value="${search.get('sncode')}"  class="scinput date_width" placeholder="兑换码">
-		</li>
-		
-		<li>
-			<label>奖品等奖</label>
-			<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option value="1" th:selected="${search.get('level')+'' eq '1' ? true : false}">一等奖</option>
-				<option value="2" th:selected="${search.get('level')+'' eq '2' ? true : false}">二等奖</option>
-				<option value="3" th:selected="${search.get('level')+'' eq '3' ? true : false}">三等奖</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>开始时间</label>
-			<input type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-		</li>
-		<li>
-			<label>结束时间</label>
-			<input type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-		</li>
-		
-		
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-		<li>
-			<ul class="toolbar">
-				<a th:href="@{/sys/award/activity/list.html}" >
-						<li class="click">&nbsp;&nbsp;<< 返回&nbsp;&nbsp;</li>
-				</a>
-			</ul>
-		</li>
-				
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>活动名称</th>
-				<th>微信昵称</th>
-				<th>微信头像</th>
-				<th>家长姓名</th>
-				<th>小孩姓名</th>
-		    	<th>抽奖状态</th>
-		    	<th>奖品名称</th>
-		    	<th>奖品等奖</th>
-		    	<th>兑换码</th>
-		    	<th>兑换码状态</th>
-		    	<th>参与时间</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('title')}"></td>
-					<td th:text="${item.get('wx_name')}"></td>
-					<td >
-						<img style="height: 40px;" th:if="${item.get('photo')!=null && item.get('photo')!=''}" th:src="${imgUrl+item.get('photo')}">
-					</td>
-					
-					<td th:text="${item.get('parent_name')}"></td>
-					<td th:text="${item.get('child_name')}"></td>
-					
-					<td th:switch="${item.status}">
-					   <span th:case="0">未中奖</span>
-					   <span th:case="1" style="color:red">已中奖</span>
-					   <span th:case="2" style="color:red">兑换奖品</span>
-					</td>
-					
-					<td th:text="${item.get('name')}"></td>
-					<td th:switch="${item.level}">
-					   <span th:case="1" style="color:red">一等奖</span>
-					   <span th:case="2" style="color:red">二等奖</span>
-					   <span th:case="3" style="color:red">三等奖</span>
-					</td>
-					<td th:text="${item.get('sn_code')}"></td>
-					
-					<td th:switch="${item.sstatus}">
-					   <span th:case="0" style="color:red">未开奖</span>
-					   <span th:case="1" style="color:red">中奖未领取</span>
-					   <span th:case="2" style="color:red">中奖已领取</span>
-					   <span th:case="3" style="color:red">已兑奖未核销</span>
-					   <span th:case="4" style="color:red">已兑换已核销</span>
-					</td>
-					<td th:text="${item.get('create_time')}"></td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/consume/list.html

@@ -1,152 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">奖品消耗明细</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/consume/list.html}" method="post">
-	<ul class="seachform">
-	
-		<li>
-			<label>始/至商户</label>
-			<select class="scinput select_width"  id="merchantId" name="merchantId"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option th:each="item:${subMerchants}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>操作类型</label>
-			<select class="scinput select_width"  id="type" name="type"   style="width: 150px;" >
-				<option value="1" th:selected="${search.get('type')+'' eq '1' ? true : false}" >我向下配送</option>
-				<option value="2" th:selected="${search.get('type')+'' eq '2' ? true : false}" >上级向我配送</option>
-				<option value="3" th:selected="${search.get('type')+'' eq '3' ? true : false}" >创建活动消耗</option>
-<!-- 				<option value="4" th:selected="${search.get('type')+'' eq '4' ? true : false}" >奖品兑换消耗</option> -->
-				<option value="5" th:selected="${search.get('type')+'' eq '5' ? true : false}" >取消活动返库</option>
-				<option value="6" th:selected="${search.get('type')+'' eq '6' ? true : false}" >奖品入库</option>
-				<option value="" th:selected="${search.get('type')+'' eq '' ? true : false}">全部</option>
-			</select>
-		</li>
-		<li>
-			<label>奖品：</label>
-			<select class="scinput select_width"  id="awardMaterialId" name="awardMaterialId"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option th:each="item:${awardMaterials}"  th:selected="${search.get('awardMaterialId') eq item.id ? true : false}" th:value="${item.id}">[[${item.name}]]</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>开始时间</label>
-			<input type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-		</li>
-		<li>
-			<label>结束时间</label>
-			<input type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-		</li>
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-		<li>
-			<ul class="toolbar">
-				<a href="javascript:;" onclick="list_export()">
-					<li class="click"><span><img th:src="@{/static/sys/images/t04.png}"></span>导出明细</li>
-				</a>
-			</ul>
-		</li>
-		
-		
-	</ul>
-	
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>始商户</th>
-				<th>至商户</th>
-				<th>操作类型</th>
-				<th>奖品数量</th>
-		    	<th>奖品名称</th>
-		    	<th>奖品等奖</th>
-		    	<th>操作时间</th>
-		    	<th>备注</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('fm_unit_name')}"></td>
-					<td th:text="${item.get('tm_unit_name')}"></td>
-					<td  th:switch="${item.type}">
-					   <span th:case="1" style="color:red">我向下配送</span>
-					   <span th:case="2" style="color:red">上级向我配送</span>
-					   <span th:case="3" style="color:red">活动消耗</span>
-					   <span th:case="4" style="color:red">兑换消耗</span>
-					   <span th:case="5" style="color:red">取消活动返库</span>
-					   <span th:case="6" style="color:red">奖品入库</span>
-					</td>
-					<td th:text="${item.get('number')}"></td>
-					<td th:text="${item.get('material_name')}"></td>
-					<td  th:switch="${item.material_level}">
-					   <span th:case="1" style="color:red">一等奖</span>
-					   <span th:case="2" style="color:red">二等奖</span>
-					   <span th:case="3" style="color:red">三等奖</span>
-					</td>
-					<td th:text="${item.get('create_time')}"></td>
-					<td th:text="${item.get('remarks')}"></td>
-					
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-	
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-	function list_export(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/consume/list_export";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/consume/list.html";
-		},3000);
-	};
-	
-</script>
-
-
-
-</html>

src/main/resources/templates/sys/award/examine/list.html

@@ -1,205 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">配送审核管理</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/examine/list.html}" method="post">
-	<ul class="seachform">
-	
-		<li>
-			<label>我的商户</label>
-			<select class="scinput select_width"  id="merchantId" name="merchantId"   style="width: 100px;" >
-				<option value="">全部</option>
-				<option th:each="item:${subMerchants}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>审核状态</label>
-			<select class="scinput select_width"  id="status" name="status"   style="width: 80px;" >
-				<option value="">全部</option>
-				<option value="0" th:selected="${search.get('status')+'' eq '0' ? true : false}" >已取消</option>
-				<option value="1" th:selected="${search.get('status')+'' eq '1' ? true : false}" >审核通过</option>
-				<option value="2" th:selected="${search.get('status')+'' eq '2' ? true : false}" >审核中</option>
-				<option value="3" th:selected="${search.get('status')+'' eq '3' ? true : false}" >审核不通过</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>活动主题：</label>
-			<input style="width: 100px;" type="text" id="title" name="title" autocomplete="off"  th:value="${search.get('title')}"  class="scinput date_width" placeholder="活动主题">
-		</li>
-		
-		<li>
-			<label>钉钉单号：</label>
-			<input style="width: 100px;" type="text" id="dingNumber" name="dingNumber" autocomplete="off"  th:value="${search.get('dingNumber')}"  class="scinput date_width" placeholder="钉钉单号">
-		</li>
-		
-		<li>
-			<label>快递单号：</label>
-			<input style="width: 100px;" type="text" id="emsNumber" name="emsNumber" autocomplete="off"  th:value="${search.get('emsNumber')}"  class="scinput date_width" placeholder="快递单号">
-		</li>
-		
-		<li>
-			<label>备注：</label>
-			<input style="width: 100px;" type="text" id="remarks" name="remarks" autocomplete="off"  th:value="${search.get('remarks')}"  class="scinput date_width" placeholder="备注">
-		</li>
-		
-		<li>
-			<label>开始时间</label>
-			<input style="width: 100px;" type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-		</li>
-		<li>
-			<label>结束时间</label>
-			<input style="width: 100px;" type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-		</li>
-		
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-				
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>始商户</th>
-				<th>至商户</th>
-				<th>至商户端口</th>
-<!-- 				<th>类型</th> -->
-				<th>一等奖(名称 / 数量)</th>
-		    	<th>二等奖(名称 / 数量)</th>
-		    	<th>三等奖(名称 / 数量)</th>
-		    	<th>发起时间</th>
-		    	<th>审核状态</th>
-		    	
-		    	<th>钉钉单号</th>
-		    	<th>快递单号</th>
-		    	<th>收货人</th>
-		    	<th>联系电话</th>
-		    	<th>配送地址</th>
-		    	<th>配送备注</th>
-		   		<th>快递单</th>
-		    
-		    	<th>操作</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('fm_unit_name')}"></td>
-					<td th:text="${item.get('tm_unit_name')}"></td>
-					<td th:text="${item.get('tm_port_num')}"></td>
-<!-- 					<td  th:switch="${item.type}"> -->
-<!-- 					   <span th:case="1" style="color:red">发放</span> -->
-<!-- 					   <span th:case="2" style="color:red">接收</span> -->
-<!-- 					</td> -->
-					<td th:text="${ item.get('level1_num')!=null ? (item.get('level1_num')+'个'  ) : '无'  }"></td>
-					<td th:text="${ item.get('level2_num')!=null ? (item.get('level2_num')+'个'  ) : '无'  }"></td>
-					<td th:text="${ item.get('level3_num')!=null ? (item.get('level3_num')+'个'  ) : '无'  } "></td>
-					<td th:text="${item.get('create_time')}"></td>
-					<td  th:switch="${item.status}">
-					   <span th:case="0" style="color:red">已取消</span>
-					   <span th:case="1" style="color:red">审核通过</span>
-					   <span th:case="2" style="color:red">审核中</span>
-					   <span th:case="3" style="color:red">拒绝</span>
-					</td>
-					
-					<td th:text="${item.get('ding_number')}"></td>
-					<td th:text="${item.get('ems_number')}"></td>
-					<td th:text="${item.get('people')}"></td>
-					<td th:text="${item.get('telephone')}"></td>
-					<td th:text="${item.get('address')}"></td>
-					<td th:text="${item.get('remarks')}"></td>
-					<td >
-						<img style="height: 40px;"  th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}">
-					</td>
-					<td> 
-						<div th:if="${item.status==2}">
-							<a href="javascript:;" th:onclick="'statusCardActivity(\''+${item.id}+'\',\'1\',\''+${item.tm_unit_name}+'\')'" class="tablelink">通过</a> 
-							<a href="javascript:;" th:onclick="'statusCardActivity(\''+${item.id}+'\',\'3\',\''+${item.tm_unit_name}+'\')'" class="tablelink">拒绝</a> 
-						</div>
-					</td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-	function statusCardActivity(id,status,name){
-		var title="";
-		if(status==1){
-			title="确定通过【"+name+"】配送审核?";
-		}else if(status==3){
-			title="确定拒绝【"+name+"】配送审核?";
-		}else{
-			
-		}
-		parent.layer.confirm(title, {
-			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-		}, function(){
-			var url="[[${sysUrl}]]/sys/award/examine/status";
-			var params ={
-			 	'id' : id,
-	            'status' :status
-	        };
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					parent.layer.msg("操作成功",{icon:1});
-					parent.location.reload();
-					parent.layer.close(parent.layer.getFrameIndex(window.name));
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-		});
-	}
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/grant/edit.html

@@ -1,443 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/city.json.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/citySetMe_V.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/Popt.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
- <style type="text/css">
-   body{min-width:180px;}
-       .select1{
-   		    width:100%;
-		    height: 32px;
-		    line-height: 32px;
-		    border-top: solid 1px #a7b5bc;
-		    border-left: solid 1px #a7b5bc;
-		    border-right: solid 1px #ced9df;
-		    border-bottom: solid 1px #ced9df;
-		    opacity:1;
-	        margin-bottom: 10px;
-    	}
-    	.btn{
-    	  width: 100px;
-    	}
-     label.control-label-error {color: Red;}	
-     
-._citys {     background-color: whitesmoke;width: 450px; display: inline-block; border: 2px solid #eee; padding: 5px; position: relative; }
-._citys span { color: #05920a; height: 15px; width: 15px; line-height: 15px; text-align: center; border-radius: 3px; position: absolute; right: 10px; top: 10px; border: 1px solid #05920a; cursor: pointer; }
-._citys0 { width: 95%; height: 34px; line-height: 34px; display: inline-block; border-bottom: 2px solid #05920a; padding: 0px 5px; font-size:14px; font-weight:bold; margin-left:6px; }
-._citys0 li { display: inline-block; line-height: 34px; font-size: 15px; color: #888; width: 80px; text-align: center; cursor: pointer; }
-._citys1 { width: 100%; display: inline-block; padding: 10px 0; }
-._citys1 a { width: 83px; height: 35px; display: inline-block; background-color: #f5f5f5; color: #666; margin-left: 6px; margin-top: 3px; line-height: 35px; text-align: center; cursor: pointer; font-size: 12px; border-radius: 5px; overflow: hidden; }
-._citys1 a:hover { color: #fff; background-color: #05920a; }
-.AreaS { background-color: #05920a !important; color: #fff !important; }
-#school{
-	margin-left: 110px;
-	padding-bottom: 10px;
-}  
-#school span{
-  	min-width: 25%;
-    float: left;
-    margin-bottom: 10px;
-}
-.joinseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}
-
-.schoolseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}    
-
-dtext{
-	color: red;
-	cursor: pointer;
-}
-.forminfo li label{
-	text-align: right;
-	padding-right: 10px
-}
-.searchable-select{
-	width: 345px;
-    margin-bottom: 13px;
-}
-  
-</style>
-<body>
-<div class="formbody">
-		<ul class="forminfo">
-			<li>
-				<label>商户名称<b>*</b></label>
-				<div class="vocation" style="margin-right: 5px; width: 345px">
-					<select name="toMerchantId" id="toMerchantId" class="select1" > 
-						<option th:each="item:${subMerchants}"  th:data-portnum="${item.portNum}"  th:value="${item.id}" th:text="${item.unitName}+' ['+${item.posCode}+']'"></option>
-					</select>
-				</div>
-			</li>
-			
-			<li>
-				<label>端口数量：<b>*</b></label>
-				<input disabled="disabled" type="number" id="portNum" class="dfinput fl" name="portNum" value="0"/>
-			</li>
-			
-			<li>
-				<label>一等奖<b>*</b></label>
-				<div class="vocation" style="margin-right: 5px; width: 145px">
-					<select name="level1MaterialId" id="level1MaterialId" class="select1 level1MaterialId" > 
-						<option value="">选择奖品</option>
-						<option th:each="item:${level1Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-					</select>
-				</div>
-				<input onblur='grantRate(this);' style="width: 95px;" type="number" id="level1Num" class="dfinput fl level1Num" name="level1Num" value="0" />
-				<text>
-					&nbsp;
-					库存:<t id="level_num" class="level_num" style="color:red">0</t>
-					&nbsp;&nbsp;
-					比例:<t id="level_num_rate" class="level_num_rate" data-val="0.005" data-numval="1"  style="color:red">200:1</t>
-				</text>
-			</li>
-			
-			<li>
-				<label>二等奖<b></b></label>
-				<div class="vocation" style="margin-right: 5px; width: 145px">
-					<select name="level2MaterialId" id="level2MaterialId" class="select1 level2MaterialId" > 
-						<option value="">选择奖品</option>
-						<option th:each="item:${level2Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-					</select>
-				</div>
-				<input onblur='grantRate(this);' style="width: 95px;" type="number" id="level2Num" class="dfinput fl level2Num" name="level2Num" value="0" />
-				<text>
-					&nbsp;
-					库存:<t id="level_num"  class="level_num" style="color:red">0</t>
-					&nbsp;&nbsp;
-					比例:<t id="level_num_rate" class="level_num_rate" data-val="0.015" data-numval="3"  style="color:red">200:3</t>
-				</text>
-			</li>
-			
-			<div id="level3MaterialDiv">
-				<li>
-					<label>三等奖<b></b></label>
-					<div class="vocation" style="margin-right: 5px; width: 145px;">
-						<select name="level3MaterialId"  class="select1 level3MaterialId" > 
-							<option value="">选择奖品</option>
-							<option th:each="item:${level3Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-						</select>
-					</div>
-					<input onblur='grantRate(this);' style="width: 95px;" type="number" class="dfinput fl level3Num" name="level3Num" value="0" />
-					
-					<text>
-						&nbsp;
-						库存:<t class="level_num" style="color:red">0</t>
-						&nbsp;&nbsp;
-						比例:<t class="level_num_rate" data-val="0.075"  data-numval="15" style="color:red">200:15</t>
-					</text>
-					
-				</li>
-			
-				<li>
-					<label>&nbsp;<b></b></label>
-					<text style="font-weight: bold;cursor: pointer;color: #056dae;font-size: 14px" id="addLevel3MaterialHtml">+添加奖品</text>
-				</li>
-			</div>
-			<li>
-				<label>钉钉单号：<b></b></label>
-				<input type="text" id="dingNumber" class="dfinput fl" name="dingNumber" />
-			</li>
-			
-			<li th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>物流单号：	<b></b></label>
-				<input type="text" id="emsNumber" class="dfinput fl" name="emsNumber" />
-			</li>
-			
-			<li th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>收货人：<b></b></label>
-				<input type="text" id="people" class="dfinput fl" name="people" />
-			</li>
-			
-			<li th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>联系电话：<b></b></label>
-				<input type="text" id="telephone" class="dfinput fl" name="telephone" />
-			</li>
-			
-			<li th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>配送地址：<b></b></label>
-				<input type="text" id="address" class="dfinput fl" name="address" />
-			</li>
-			
-			<li th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>配送备注：<b></b></label>
-				<input type="text" id="remarks" class="dfinput fl" name="remarks" />
-			</li>
-			
-			<li style="margin-bottom:3px" th:if="${curMerchant!=null && 'shadmin' ne curMerchant.posCode}">
-				<label>快递单号：<b></b></label>
-				<input type="hidden" id="img" data-path="" />
-				<plug id="pluguploadid" th:include="sys/common/imgUpload"  th:inline="javascript"  data-bindelem="#img"   data-type="1" data-maxnum="2"  \>
-			</li>
-			
-			
-			<li style="padding-top: 20px">
-				<label>&nbsp;</label>
-				<button type="submit" onclick="save();" class="btn">提交</button>
-				<button type="button" class="btn" onclick="closeWin();">取消</button>
-			</li>
-			
-		</ul>
-			
-</div>
-
-<div id="level3MaterialHtml" style="display: none">
-	<li>
-		<label>三等奖<b></b></label>
-		<div class="vocation" style="margin-right: 5px; width: 145px;">
-			<select name="level3MaterialId" class="select1 level3MaterialId" > 
-				<option value="">选择奖品</option>
-				<option th:each="item:${level3Materials}"  th:value="${item.id}" th:text="${item.name}"></option>
-			</select>
-		</div>
-		<input onblur='grantRate(this);' style="width: 95px;" type="number"  class="dfinput fl level3Num" name="level3Num" value="0" />
-		<text>
-			&nbsp;
-			库存:<t class="level_num" style="color:red">0</t>
-			&nbsp;&nbsp;
-			比例:<t class="level_num_rate" data-val="0.075"  data-numval="15" style="color:red">200:15</t>
-			&nbsp;
-			<t class="level_delete" style="color:red;cursor: pointer;">-删除-</t>
-		</text>
-		
-	</li>
-</div>
-
-
-
-</body>
-<script type="text/javascript">
-var shadmin="[[${curMerchant.posCode}]]";
-
-
-// $(function(){
-// 	$('#toMerchantId').searchableSelect();
-// });
-
-
-function save(){
-	
-	if(shadmin=='shadmin' && $("#dingNumber").val()==''){
-		parent.layer.msg("钉钉单号不能为空",{icon:11});
-		return
-	}
-	if($("#portNum").val()<=0){
-		parent.layer.msg("此商户端口数量不足",{icon:11});
-		return
-	}
-	
-	if($("#level1MaterialId").val()==''){
-		parent.layer.msg("请选择一等奖品",{icon:11});
-		return
-	}
-	
-	var level1MaterialJson=[];
-	var level2MaterialJson=[];
-	var level3MaterialJson=[];
-	
-	if($("#level1MaterialId").val()!=''){
-		if($("#level1Num").val()<=0){
-			parent.layer.msg("一等奖数量不能少等于0",{icon:11});
-			return
-		}
-		if(parseInt($("#level1_num").html())<$("#level1Num").val()){
-			parent.layer.msg("一等奖数量不能大于库存量",{icon:11});
-			return
-		}
-		
-		if(!grantRate($("#level1Num"))){
-			return
-		}
-		level1MaterialJson.push({'level1MaterialId':$("#level1MaterialId").val(),'level1Num':$("#level1Num").val()});
-	}
-	if($("#level2MaterialId").val()!=''){
-		if($("#level2Num").val()<=0){
-			parent.layer.msg("二等奖数量不能少等于0",{icon:11});
-			return
-		}
-		if(parseInt($("#level2_num").html())<$("#level2Num").val()){
-			parent.layer.msg("二等奖数量不能大于库存量",{icon:11});
-			return
-		}
-		
-		if(!grantRate($("#level2Num"))){
-			return
-		}
-		level2MaterialJson.push({'level2MaterialId':$("#level2MaterialId").val(),'level2Num':$("#level2Num").val()});
-	}
-	
-	var level3MaterialIds=$("#level3MaterialDiv").find(".level3MaterialId");
-	var level3Nums=$("#level3MaterialDiv").find(".level3Num");
-	
-	for (var i = 0; i < level3MaterialIds.length; i++) {
-		if(level3MaterialIds[i]!=''){
-			if(level3Nums[i]<=0){
-				parent.layer.msg("三等奖数量不能少等于0",{icon:11});
-				return
-			}
-			
-			level3MaterialJson.push({'level3MaterialId':$(level3MaterialIds[i]).val(),'level3Num':$(level3Nums[i]).val()});
-		}
-	}
-	
-// 	if($("#level3MaterialId").val()!=''){
-// 		if($("#level3Num").val()<=0){
-// 			parent.layer.msg("三等奖数量不能少等于0",{icon:11});
-// 			return
-// 		}
-// 		if(parseInt($("#level3_num").html())<$("#level3Num").val()){
-// 			parent.layer.msg("三等奖数量不能大于库存量",{icon:11});
-// 			return
-// 		}
-// 		if(!grantRate($("#level3Num"),$("#level3_num_rate"))){
-// 			return
-// 		}
-// 	}
-	
-	parent.layer.confirm("确定配送奖品?", {
-		icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-	}, function(){
-		var url="[[${sysUrl}]]/sys/award/grant/save";
-		var params ={
-            'toMerchantId' : $("#toMerchantId").val(),
-            
-            'level1MaterialIds' : JSON.stringify(level1MaterialJson),
-            'level2MaterialIds' : JSON.stringify(level2MaterialJson),
-            'level3MaterialIds' : JSON.stringify(level3MaterialJson),
-            
-            'remarks' : $("#remarks").val(),
-            
-            'dingNumber' : $("#dingNumber").val(),
-            'emsNumber' : $("#emsNumber").val(),
-            'people' : $("#people").val(),
-            'telephone' : $("#telephone").val(),
-            'img' : $("#img").val(),
-            'address':$("#address").val()
-        };
-		$.post(url,params,function(data){
-			if(data.meta.success){
-				parent.layer.msg("保存成功",{icon:1});
-				parent.location.reload();
-				parent.layer.close(parent.layer.getFrameIndex(window.name));
-			}else{
-				parent.layer.msg(data.meta.message,{icon:11});
-			}
-		});
-	});
-}
-
-
-function merchantInfo(){
-	var id=$('#toMerchantId').val();
-	var url="[[${sysUrl}]]/sys/award/merchant/info";
-	var params ={'id' :id};
-	$.post(url,params,function(data){
-		if(data.meta.success){
-			$("#portNum").val(data.data.merchant.portNum);
-			$("#people").val(data.data.merchant.deputyName);
-			$("#telephone").val(data.data.merchant.deputyPhone);
-			$("#address").val(data.data.merchant.address);
-			
-			if(data.data.merchant.portNum<=0){
-				parent.layer.msg("此商户端口数不足，无法为其配送奖品。",{icon:11});
-			}
-		}else{
-			parent.layer.msg(data.meta.message,{icon:11});
-		}
-	});
-}
-
-//level1Num level1_num_rate  grantRate($("#level1Num"),$("#level1_num_rate"));
-function grantRate(obj){
-	var level=$(obj);
-	var rate=$(obj).parent().find(".leve_num_rate");
-	
-	if($("#portNum").val()<=0){
-		parent.layer.msg("此商户端口数不足，无法为其配送奖品。",{icon:11});
-		return false;
-	}
-  	var rateVal=$(rate).data("val");
-  	var numVal=$(rate).data("numval");
-  	var currate=new Number($(level).val()).toFixed(3)/new Number($("#portNum").val()).toFixed(3);
-  	if(currate>rateVal){
-  		parent.layer.msg("端口配送比例为："+$(rate).html()+"</br>配送数量上限为："+new Number($("#portNum").val()/200*numVal).toFixed(0),{icon:11});
-  		return false;
-  	}
-  	return true;
-}
-
-
-
-$(function (){
-	
-	 merchantInfo();
-	
-	 $('#addLevel3MaterialHtml').click(function(){
-		 $(this).parent().before($("#level3MaterialHtml").html());
-	 });
-	 
-	 $('#toMerchantId').change(function(){
-	      merchantInfo();  	
-	 });
-	
-	 $('#level1MaterialId').change(function(){
-      	var levelMaterialId= $(this).val();
-      	
-      	getStock($(this).parent().parent().find(".level_num"),levelMaterialId);
-      	
-      	grantRate($(this).parent().parent().find(".level1Num"));
-      	
-   	 });
-	 
-	 
-	 $('#level2MaterialId').change(function(){
-      	var levelMaterialId= $(this).val();
-      	
-      	getStock($(this).parent().parent().find(".level_num"),levelMaterialId);
-      	
-    	grantRate($(this).parent().parent().find(".level2Num"));
-   	 });
-	 
-	 
-	 $("body").on("change",'.level3MaterialId',function(){
-      	var levelMaterialId= $(this).val();
-      	
-      	getStock($(this).parent().parent().find(".level_num"),levelMaterialId);
-      	
-      	grantRate($(this).parent().parent().find(".level3Num"));
-   	 });
-	 
-	 
-	 $("body").on("click",'.level_delete',function(){
-		 $(this).parent().parent().remove();
-	  });
-
-	 function getStock(obj,levelMaterialId){
-		 var url="[[${sysUrl}]]/sys/award/grant/stock/get";
-			var params ={'levelMaterialId' : levelMaterialId};
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					$(obj).html(data.data.stock);
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-	 }
-	 	
-})
-
-</script>
-</html>

src/main/resources/templates/sys/award/grant/info.html

@@ -1,134 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">配送奖品明细</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/grant/info.html}" method="post">
-	<input type="hidden" th:value="${search.get('grantId')}" name="grantId" >
-	<ul class="seachform">
-		<li>
-			<label>奖品等级</label>
-			<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option  th:selected="${search.get('level') eq '1' ? true : false}" value="1">一等奖</option>
-				<option  th:selected="${search.get('level') eq '2' ? true : false}" value="2">二等奖</option>
-				<option  th:selected="${search.get('level') eq '3' ? true : false}" value="3">三等奖</option>
-			</select>
-		</li>
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>奖品名称</th>
-				<th>奖品等级</th>
-				<th>奖品数量</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-				<td th:text="${itemStat.count}"></td>
-				<td th:text="${item.get('name')}"></td>
-					<td th:switch="${item.get('level')}">
-				   <span th:case="1" style="color:red">一等奖</span>
-				   <span th:case="2" style="color:red">二等奖</span>
-				   <span th:case="3" style="color:red">三等奖</span>
-				</td>
-				<td th:text="${item.get('num')}"></td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-	
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-
-	function editCardActivity(id){
-		var title="添加活动";
-		if(id!=null && id!='' && id!=undefined){
-			title="编辑活动";
-		}
-		parent.layer.open({
-		    type: 2,
-		    title: title,
-		    closeBtn: 1, //不显示关闭按钮
-		    shift: 0.8,
-		    offset: '100px',
-		    area: ['40%', '70%'],
-		    content: '[[${sysUrl}]]/sys/award/activity/edit.html?id='+id
-		});
-	}
-	
-	
-	function statusCardActivity(id){
-		parent.layer.confirm("确定取消活动?", {
-			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-		}, function(){
-			var url="[[${sysUrl}]]/sys/award/activity/status";
-			var params ={
-			 	'id' : id,
-	            'status' :"0"
-	        };
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					parent.layer.msg("删除成功",{icon:1});
-					parent.location.reload();
-					parent.layer.close(parent.layer.getFrameIndex(window.name));
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-		});
-	}
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/grant/list.html

@@ -1,262 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">奖品配送管理</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/grant/list.html}" method="post">
-	<ul class="seachform">
-	
-		<li>
-			<label>至商户</label>
-			<select class="scinput select_width"  id="merchantId" name="merchantId"   style="width: 100px;" >
-				<option value="">全部</option>
-				<option th:each="item:${subMerchants}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>审核状态</label>
-			<select class="scinput select_width"  id="status" name="status"   style="width: 80px;" >
-				<option value="">全部</option>
-				<option value="0" th:selected="${search.get('status')+'' eq '0' ? true : false}" >已取消</option>
-				<option value="1" th:selected="${search.get('status')+'' eq '1' ? true : false}" >审核通过</option>
-				<option value="2" th:selected="${search.get('status')+'' eq '2' ? true : false}" >审核中</option>
-				<option value="3" th:selected="${search.get('status')+'' eq '3' ? true : false}" >审核不通过</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>发货状态</label>
-			<select class="scinput select_width"  id="ems" name="ems"   style="width: 80px;" >
-				<option value="">全部</option>
-				<option value="1" th:selected="${search.get('ems')+'' eq '1' ? true : false}" >已发货</option>
-				<option value="2" th:selected="${search.get('ems')+'' eq '2' ? true : false}" >待发货</option>
-			</select>
-		</li>
-		
-		<li>
-			<label>钉钉单号：</label>
-			<input  style="width: 100px;" type="text" id="dingNumber" name="dingNumber" autocomplete="off"  th:value="${search.get('dingNumber')}"  class="scinput date_width" placeholder="钉钉单号">
-		</li>
-		
-		<li>
-			<label>快递单号：</label>
-			<input style="width: 100px;" type="text" id="emsNumber" name="emsNumber" autocomplete="off"  th:value="${search.get('emsNumber')}"  class="scinput date_width" placeholder="快递单号">
-		</li>
-		
-		<li>
-			<label>备注：</label>
-			<input style="width: 100px;" type="text" id="remarks" name="remarks" autocomplete="off"  th:value="${search.get('remarks')}"  class="scinput date_width" placeholder="备注">
-		</li>
-		
-		<li>
-			<label>开始时间</label>
-			<input  style="width: 100px;" type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-		</li>
-		<li>
-			<label>结束时间</label>
-			<input  style="width: 100px;" type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-		</li>
-		
-	
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-		<li >
-			<ul class="toolbar" th:if="${curMerchant.posCode ne 'ssj001'}">
-				<a href="javascript:;" onclick="editCardMaterial('')">
-					<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>添加配送</li>
-				</a>
-			</ul>
-		</li>
-		
-		
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>始商户</th>
-				<th>至商户</th>
-<!-- 				<th>类型</th> -->
-				<th>一等奖(名称 / 数量)</th>
-		    	<th>二等奖(名称 / 数量)</th>
-		    	<th>三等奖(名称 / 数量)</th>
-		    	<th>发起时间</th>
-		    	<th>活动状态</th>
-		    	<th>审核时间</th>
-		    	
-		    	<th>钉钉单号</th>
-<!-- 		    	<th>快递单号</th> -->
-<!-- 		    	<th>收货人</th> -->
-<!-- 		    	<th>联系电话</th> -->
-<!-- 		    	<th>配送地址</th> -->
-<!-- 		    	<th>配送备注</th> -->
-<!-- 		   		<th>快递单</th> -->
-		   		<th>发货状态</th>
-		   		<th>发货时间</th>
-		    
-		    	<th>操作</th>
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('fm_unit_name')}"></td>
-					<td th:text="${item.get('tm_unit_name')}"></td>
-<!-- 					<td  th:switch="${item.type}"> -->
-<!-- 					   <span th:case="1" style="color:red">发放</span> -->
-<!-- 					   <span th:case="2" style="color:red">接收</span> -->
-<!-- 					</td> -->
-					<td>
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/grant/info.html(grantId=${item.id},level=1 )}">
-							[[${item.get('level1_num')}]]个
-						</a>
-					</td>
-					<td >
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/grant/info.html(grantId=${item.id},level=2 )}">
-							[[${item.get('level2_num')}]]个
-						</a>
-					</td>
-					<td >
-						<a style="color: red" href="javascript:;" th:href="@{/sys/award/grant/info.html(grantId=${item.id},level=3 )}">
-							[[${item.get('level3_num')}]]个
-						</a>
-					</td>
-					<td th:text="${item.get('create_time')}"></td>
-					<td  th:switch="${item.status}">
-					   <span th:case="0" style="color:red">已取消</span>
-					   <span th:case="1" style="color:red">已通过</span>
-					   <span th:case="2" style="color:red">审核中</span>
-					   <span th:case="3" style="color:red">审核不通过</span>
-					</td>
-					<td th:text="${item.get('update_time')}"></td>
-					
-					<td th:text="${item.get('ding_number')}"></td>
-<!-- 					<td th:text="${item.get('ems_number')}"></td> -->
-<!-- 					<td th:text="${item.get('people')}"></td> -->
-<!-- 					<td th:text="${item.get('telephone')}"></td> -->
-<!-- 					<td th:text="${item.get('address')}"></td> -->
-<!-- 					<td th:text="${item.get('remarks')}"></td> -->
-<!-- 					<td > -->
-<!-- 						<img style="height: 40px;"  th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}"> -->
-<!-- 					</td> -->
-					<td style="color:red" th:text="${item.get('ems_time')==null ? '待发货' : '已发货' }"></td>
-					<td th:text="${item.get('ems_time')}"></td>
-					
-					<td> 
-						<div th:if="${item.status==1}">
-							<a th:if="${item.get('ems_time')==null }" style="color: red" href="javascript:;" th:onclick="'emsCardMaterial(\''+${item.id}+'\',\'1\')'" class="tablelink">添加物流</a> 
-							<a th:if="${item.get('ems_time')!=null }" href="javascript:;" th:onclick="'emsCardMaterial(\''+${item.id}+'\',\'2\')'" class="tablelink">查看物流</a> 
-						</div>
-					</td>
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-	function editCardMaterial(id){
-		var title="添加配送";
-		if(id!=null && id!='' && id!=undefined){
-			title="编辑配送";
-		}
-		parent.layer.open({
-		    type: 2,
-		    title: title,
-		    closeBtn: 1, //不显示关闭按钮
-		    shift: 0.8,
-		    offset: '100px',
-		    area: ['800px', '70%'],
-		    content: '[[${sysUrl}]]/sys/award/grant/edit.html?id='+id
-		});
-	}
-	
-	
-
-	function emsCardMaterial(id,type){
-		var title="添加物流";
-		if(type==2){
-			title="查看物流";
-		}
-		parent.layer.open({
-		    type: 2,
-		    title: title,
-		    closeBtn: 1, //不显示关闭按钮
-		    shift: 0.8,
-		    offset: '100px',
-		    area: ['40%', '70%'],
-		    content: '[[${sysUrl}]]/sys/award/grant/ems.html?id='+id+"&type="+type
-		});
-	}
-	
-	function statusCardMaterial(id){
-		parent.layer.confirm("确定删除奖品信息?", {
-			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-		}, function(){
-			var url="[[${sysUrl}]]/sys/award/material/status";
-			var params ={
-			 	'id' : id,
-	            'status' :"0"
-	        };
-			$.post(url,params,function(data){
-				if(data.meta.success){
-					parent.layer.msg("删除成功",{icon:1});
-					parent.location.reload();
-					parent.layer.close(parent.layer.getFrameIndex(window.name));
-				}else{
-					parent.layer.msg(data.meta.message,{icon:11});
-				}
-			});
-		});
-	}
-	
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/material/consume.html

@@ -1,156 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
-<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">配送物资管理-奖品编号:[[${search.get('awardMaterialId')}]]</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/material/consume.html}" method="post">
-		<input id="id" name="id" th:value="${search.get('awardMaterialId')}" type="hidden">
-		<ul class="seachform">
-			<li>
-				<label>我的商户</label>
-				<select class="scinput select_width"  id="merchantId" name="merchantId"   style="width: 150px;" >
-					<option value="">全部</option>
-					<option th:each="item:${subMerchants}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
-				</select>
-			</li>
-			<li>
-				<label>配送状态</label>
-				<select class="scinput select_width"  id="status" name="status"   style="width: 150px;" >
-					<option value="">全部</option>
-					<option value="0" th:selected="${search.get('status')+'' eq '0' ? true : false}" >已取消</option>
-					<option value="1" th:selected="${search.get('status')+'' eq '1' ? true : false}" >审核通过</option>
-					<option value="2" th:selected="${search.get('status')+'' eq '2' ? true : false}" >审核中</option>
-					<option value="3" th:selected="${search.get('status')+'' eq '3' ? true : false}" >审核不通过</option>
-				</select>
-			</li>
-			
-			<li>
-				<label>开始时间</label>
-				<input type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-			</li>
-			<li>
-				<label>结束时间</label>
-				<input type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-			</li>
-			
-		
-			<li>
-				<input type="button" class="scbtn" value="查询" />
-			</li>
-			
-			<li>
-				<ul class="toolbar">
-					<a th:href="@{/sys/award/material/list.html}" >
-						<li class="click">&nbsp;&nbsp;<< 返回&nbsp;&nbsp;</li>
-					</a>
-				</ul>
-			</li>
-				
-		</ul>
-	
-	
-	
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>始商户</th>
-				<th>至商户</th>
-				<th>一等奖(名称 / 数量)</th>
-		    	<th>二等奖(名称 / 数量)</th>
-		    	<th>三等奖(名称 / 数量)</th>
-		    	<th>发起时间</th>
-		    	<th>配送状态</th>
-		    	
-		    	<th>钉钉单号</th>
-		    	<th>快递单号</th>
-		    	<th>收货人</th>
-		    	<th>联系电话</th>
-		    	<th>配送地址</th>
-		    	<th>配送备注</th>
-		   		<th>快递单</th>
-
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-			
-						<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('fm_unit_name')}"></td>
-					<td th:text="${item.get('tm_unit_name')}"></td>
-					<td th:text="${ item.get('level1_material_name')!=null ? (item.get('level1_material_name')+' / '+item.get('level1_num')+'个'  ) : '无'  }"></td>
-					<td th:text="${ item.get('level2_material_name')!=null ? (item.get('level2_material_name')+' / '+item.get('level2_num')+'个'  ) : '无'  }"></td>
-					<td th:text="${ item.get('level3_material_name')!=null ? (item.get('level3_material_name')+' / '+item.get('level3_num')+'个'  ) : '无'  } "></td>
-					<td th:text="${item.get('create_time')}"></td>
-					<td  th:switch="${item.status}">
-					   <span th:case="0" style="color:red">已取消</span>
-					   <span th:case="1" style="color:red">审核通过</span>
-					   <span th:case="2" style="color:red">审核中</span>
-					   <span th:case="3" style="color:red">审核不通过</span>
-					</td>
-					
-					<td th:text="${item.get('ding_number')}"></td>
-					<td th:text="${item.get('ems_number')}"></td>
-					<td th:text="${item.get('people')}"></td>
-					<td th:text="${item.get('telephone')}"></td>
-					<td th:text="${item.get('address')}"></td>
-					<td th:text="${item.get('remarks')}"></td>
-					<td >
-						<img style="height: 40px;"  th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}">
-					</td>
-
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-
-	$(function(){
-		$('#merchantId').searchableSelect();
-	});
-
-
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>

src/main/resources/templates/sys/award/material/list.html

@@ -74,17 +74,14 @@
 				<th style="width: 50px;">序号</th>
 				<th>奖品名称</th>
 				<th>等级</th>
-				<th>库存数量</th>
+				<th>录入总库存</th>
 				<th>已用库存</th>
-				<th>审核库存</th>
+				<th>未用库存</th>
 				<th>兑换积分</th>
 				<th>市场价</th>
-<!-- 		    	<th>奖品LOGO</th> -->
 		    	<th>奖品备注</th>
 		    	<th>奖品LOGO</th>
 		    	<th>创建时间</th>
-		    	<th>奖品配送</th>
-		    	<th>奖品明细</th>
 		    	<th>操作</th>
 		    </tr>
 		</thead>
@@ -93,28 +90,39 @@
 					<td th:text="${itemStat.count}"></td>
 					<td th:text="${item.get('name')}"></td>
 					<td  th:switch="${item.level}">
-					   <span th:case="1" style="color:red">一等奖</span>
-					   <span th:case="2" style="color:red">二等奖</span>
-					   <span th:case="3" style="color:red">三等奖</span>
-					   <span th:case="4" style="color:red">四等奖</span>
+					   <span th:case="1" >一等奖</span>
+					   <span th:case="2" >二等奖</span>
+					   <span th:case="3" >三等奖</span>
+					   <span th:case="4" >四等奖</span>
+					</td>
+					<td >
+						<a style="color: red" href="javascript:;" th:href="@{/sys/award/sncode/list.html(awardMaterialId=${item.id} )}">
+							[[${item.get('stock_number')}]]
+						</a>
+					</td>
+					<td >
+						<a style="color: red" href="javascript:;" th:href="@{/sys/award/sncode/list.html(awardMaterialId=${item.id},status='1;2;3;4' )}">
+							[[${item.get('use_number')}]]
+						</a>
+					</td>
+					<td >
+						<a style="color: red" href="javascript:;" th:href="@{/sys/award/sncode/list.html(awardMaterialId=${item.id},status='0' )}">
+							[[${item.get('not_use_number')}]]
+						</a>
 					</td>
-					<td th:text="${item.get('stock_number')}"></td>
-					<td th:text="${item.get('use_number')}"></td>
-					<td th:text="${item.get('lock_number')}"></td>
 					<td th:text="${item.get('exchange_integral')}"></td>
 					<td th:text="${item.get('price')}"></td>
-<!-- 					<td th:text="${item.get('img')}"></td> -->
 					<td th:text="${item.get('remarks')}"></td>
 					<td >
 						<img style="height: 40px;"  th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}">
 					</td>
 					<td th:text="${item.get('create_time')}"></td>
-					<td> 
-						<a th:href="${sysUrl+'/sys/award/material/consume.html?id='+item.id }" class="tablelink">奖品配送明细</a> 
-					</td>
-					<td> 
-						<a th:href="${sysUrl+'/sys/award/sncode/list.html?awardMaterialId='+item.id }" class="tablelink">奖品信息</a>
-					</td>
+<!-- 					<td>  -->
+<!-- 						<a th:href="${sysUrl+'/sys/award/material/consume.html?id='+item.id }" class="tablelink">奖品配送明细</a>  -->
+<!-- 					</td> -->
+<!-- 					<td>  -->
+<!-- 						<a th:href="${sysUrl+'/sys/award/sncode/list.html?awardMaterialId='+item.id }" class="tablelink">奖品信息</a> -->
+<!-- 					</td> -->
 					<td>
 						<div th:if="${curMerchant.posCode ne 'sishujia'}">
 						<a href="javascript:;" th:onclick="'numberCardMaterial(\''+${item.id}+'\')'" class="tablelink">新增库存</a>

src/main/resources/templates/sys/award/material/number.html

@@ -72,7 +72,7 @@ dtext{
 			<li>
 				<label>奖品名称<b>*</b></label>
 				<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${awardMaterial.id}"/>
-				<input type="text" id="name" class="dfinput fl" name="name" th:value="${awardMaterial.name}"/>
+				<input type="text"  readonly="readonly"  id="name" class="dfinput fl" name="name" th:value="${awardMaterial.name}"/>
 			</li>
 			<li>
 				<label>新增库存：<b>*</b></label>

src/main/resources/templates/sys/award/grant/ems.html

@@ -68,42 +68,36 @@ dtext{
 <body>
 <div class="formbody">
 		<ul class="forminfo">
-			<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${awardGrant.id}"/>
+			<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${awardSncode.id}"/>
 			<li>
 				<label>钉钉单号：<b>*</b></label>
-				<input type="text" id="dingNumber" class="dfinput fl" name="dingNumber" th:value="${awardGrant.dingNumber}" />
+				<input type="text" id="dingNumber" class="dfinput fl" name="dingNumber" th:value="${awardSncode.dingNumber}" />
 			</li>
 			
 			<li>
 				<label>物流单号：	<b>*</b></label>
-				<input type="text" id="emsNumber" class="dfinput fl" name="emsNumber" th:value="${awardGrant.emsNumber}" />
+				<input type="text" id="emsNumber" class="dfinput fl" name="emsNumber" th:value="${awardSncode.emsNumber}" />
 			</li>
 			
 			<li>
 				<label>收货人：<b>*</b></label>
-				<input type="text" id="people" class="dfinput fl" name="people" th:value="${awardGrant.people}" />
+				<input type="text" id="people" class="dfinput fl" name="people" th:value="${awardSncode.people}" />
 			</li>
 			
 			<li>
 				<label>联系电话：<b>*</b></label>
-				<input type="text" id="telephone" class="dfinput fl" name="telephone" th:value="${awardGrant.telephone}" />
+				<input type="text" id="telephone" class="dfinput fl" name="telephone" th:value="${awardSncode.telephone}" />
 			</li>
 			
 			<li>
 				<label>配送地址：<b>*</b></label>
-				<input type="text" id="address" class="dfinput fl" name="address" th:value="${awardGrant.address}"  />
+				<input type="text" id="address" class="dfinput fl" name="address" th:value="${awardSncode.address}"  />
 			</li>
 			
-			<li>
-				<label>配送备注：<b></b></label>
-				<input type="text" id="remarks" class="dfinput fl" name="remarks" th:value="${awardGrant.remarks}" />
-			</li>
-			
-			
 			<li style="margin-bottom:3px">
 				<label>快递单号：<b></b></label>
-				<input type="hidden" id="img" th:data-path="${awardGrant.img}" />
-				<plug id="pluguploadid" th:include="sys/common/imgUpload"  th:inline="javascript"  data-bindelem="#img" th:data-filepaths="${awardGrant.img}" data-type="1" data-maxnum="2"  \>
+				<input type="hidden" id="img" th:data-path="${awardSncode.img}" />
+				<plug id="pluguploadid" th:include="sys/common/imgUpload"  th:inline="javascript"  data-bindelem="#img" th:data-filepaths="${awardSncode.img}" data-type="1" data-maxnum="2"  \>
 			</li>
 			
 			
@@ -144,7 +138,7 @@ function save(){
 	parent.layer.confirm("确定保存物流信息?", {
 		icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 	}, function(){
-		var url="[[${sysUrl}]]/sys/award/grant/ems/save";
+		var url="[[${sysUrl}]]/sys/award/sncode/ems/save";
 		var params ={
 			'id' : $("#id").val(),
             'remarks' : $("#remarks").val(),

src/main/resources/templates/sys/award/sncode/list.html

@@ -22,14 +22,13 @@
 	<span>位置：</span>
 	<ul class="placeul">
 		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">活动抽奖管理-[[${ search.get('awardMaterialId')!=''? '奖品编号：'+search.get('awardMaterialId') :  '活动编号：'+search.get('awardActivityId')  }]]</a></li>
+		<li><a href="#">奖品码管理-[[${ '奖品编号：'+search.get('awardMaterialId')}]]</a></li>
 	</ul>
 </div>
 <div class="rightinfo">
 	<form id="seachform" th:action="@{/sys/award/sncode/list.html}" method="post">
 	
 		<input type="hidden" id="awardMaterialId" name="awardMaterialId" autocomplete="off"  th:value="${search.get('awardMaterialId')}"  class="scinput date_width">
-		<input type="hidden" id="awardActivityId" name="awardActivityId" autocomplete="off"  th:value="${search.get('awardActivityId')}"  class="scinput date_width">
 		
 		<ul class="seachform">
 			<li>
@@ -37,15 +36,15 @@
 				<input type="text" id="snCode" name="snCode" autocomplete="off"  th:value="${search.get('snCode')}"  class="scinput date_width" placeholder="奖品码">
 			</li>
 			
-			<li>
-				<label>奖品等奖</label>
-				<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" >
-					<option value="">全部</option>
-					<option value="1" th:selected="${search.get('level')+'' eq '1' ? true : false}">一等奖</option>
-					<option value="2" th:selected="${search.get('level')+'' eq '2' ? true : false}">二等奖</option>
-					<option value="3" th:selected="${search.get('level')+'' eq '3' ? true : false}">三等奖</option>
-				</select>
-			</li>
+<!-- 			<li> -->
+<!-- 				<label>奖品等奖</label> -->
+<!-- 				<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" > -->
+<!-- 					<option value="">全部</option> -->
+<!-- 					<option value="1" th:selected="${search.get('level')+'' eq '1' ? true : false}">一等奖</option> -->
+<!-- 					<option value="2" th:selected="${search.get('level')+'' eq '2' ? true : false}">二等奖</option> -->
+<!-- 					<option value="3" th:selected="${search.get('level')+'' eq '3' ? true : false}">三等奖</option> -->
+<!-- 				</select> -->
+<!-- 			</li> -->
 		
 			
 			<li>
@@ -56,7 +55,8 @@
 				<label>奖品状态：</label>
 				<select class="scinput select_width"  id="status" name="status"   style="width: 150px;" >
 					<option value="" >全部</option>
-					<option value="0" th:selected="${search.get('status')+'' eq '0' ? true : false}" >未开奖</option>
+					<option value="0" th:selected="${search.get('status')+'' eq '0' ? true : false}" >未使用</option>
+					<option value="1;2;3;4" th:selected="${search.get('status')+'' eq '1;2;3;4' ? true : false}" >已使用</option>
 					<option value="1" th:selected="${search.get('status')+'' eq '1' ? true : false}" >中奖未领取</option>
 					<option value="2" th:selected="${search.get('status')+'' eq '2' ? true : false}" >中奖已领取</option>
 					<option value="3" th:selected="${search.get('status')+'' eq '3' ? true : false}" >兑奖未核销</option>
@@ -65,29 +65,33 @@
 			</li> 
 			
 			<li>
-				<label>开始时间</label>
-				<input type="text" id="startTime" name="startTime" autocomplete="off" onclick="WdatePicker()" th:value="${search.get('startTime')}"   class="scinput date_width " placeholder="开始时间">
-			</li>
-			<li>
-				<label>结束时间</label>
-				<input type="text" id="endTime" name="endTime" autocomplete="off"  onclick="WdatePicker()"  th:value="${search.get('endTime')}" class="scinput date_width " placeholder="结束时间">
-			</li>
+				<label>物流状态：</label>
+				<select class="scinput select_width"  id="emsstatus" name="emsstatus"   style="width: 150px;" >
+					<option value="" >全部</option>
+					<option value="0" th:selected="${search.get('emsstatus')+'' eq '0' ? true : false}" >未发贷</option>
+					<option value="1" th:selected="${search.get('emsstatus')+'' eq '1' ? true : false}" >已发贷</option>
+				</select>
+			</li> 
 			
 			<li>
+				<label>排序条件：</label>
+				<select class="scinput select_width"  id="order" name="order"   style="width: 150px;" >
+					<option value="create_time" th:selected="${search.get('order')+'' eq 'create_time' ? true : false}">生成时间</option>
+					<option value="draw_time" th:selected="${search.get('order')+'' eq 'draw_time' ? true : false}" >未发贷</option>
+					<option value="closure_time" th:selected="${search.get('order')+'' eq 'closure_time' ? true : false}" >已发贷</option>
+					<option value="ems_time" th:selected="${search.get('order')+'' eq 'ems_time' ? true : false}" >已发贷</option>
+				</select>
+			</li> 
+				
+			<li>
 				<input type="button" class="scbtn" value="查询" />
 			</li>
 			
 			<li>
 				<ul class="toolbar">
-				
-					<a th:if="${search.get('awardMaterialId')!=''}" th:href="@{/sys/award/material/list.html}" >
+					<a th:href="@{/sys/award/material/list.html}" >
 							<li class="click">&nbsp;&nbsp;<< 返回&nbsp;&nbsp;</li>
 					</a>
-					
-					<a th:if="${search.get('awardActivityId')!=''}" th:href="@{/sys/award/activity/list.html}" >
-							<li class="click">&nbsp;&nbsp;<< 返回&nbsp;&nbsp;</li>
-					</a>
-					
 				</ul>
 			</li>
 		</ul>
@@ -96,39 +100,50 @@
 		<thead>
 		    <tr>
 				<th style="width: 50px;">序号</th>
-				<th>商户名称</th>
-				<th>活动名称</th>
 				<th>奖品码</th>
 				<th>奖品名称</th>
 				<th>奖品等奖</th>
 				<th>奖品状态</th>
+				<th>生成时间</th>
 				<th>中奖者</th>
-		    	<th>状态更新时间</th>
+				<th>中奖机构</th>
+		    	<th>中奖时间</th>
+		    	<th>核销时间</th>
+		    	<th>物流状态</th>
+		    	<th>物流时间</th>
 		    </tr>
 		</thead>
 		<tbody>
 			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('unit_name')}"></td>
-					<td th:text="${item.get('title')}"></td>
+					<td th:text="${itemStat.count+((page.pageNo-1)*page.pageSize) }"></td>
 					<td th:text="${item.get('sn_code')}"></td>
 					<td th:text="${item.get('name')}"></td>
 					<td  th:switch="${item.level}">
-					   <span th:case="1" style="color:red">一等奖</span>
-					   <span th:case="2" style="color:red">二等奖</span>
-					   <span th:case="3" style="color:red">三等奖</span>
-					   <span th:case="4" style="color:red">四等奖</span>
+					   <span th:case="1" >一等奖</span>
+					   <span th:case="2" >二等奖</span>
+					   <span th:case="3" >三等奖</span>
+					   <span th:case="4" >四等奖</span>
 					</td>
 					<td  th:switch="${item.status}">
-					   <span th:case="0" style="color:red"></span>
+					   <span th:case="0" style="color:red">未使用</span>
 					   <span th:case="1" style="color:red">中奖未领取</span>
 					   <span th:case="2" style="color:red">中奖已领取</span>
 					   <span th:case="3" style="color:red">兑奖未核销</span>
 					   <span th:case="4" style="color:red">兑奖已核销</span>
 					   <span th:case="5" style="color:red">取消活动无效</span>
 					</td>
+					<td th:text="${item.get('create_time')}"></td>
 					<td th:text="${item.get('child_name')}"></td>
-					<td th:text="${item.get('update_time')}"></td>
+					<td th:text="${item.get('league_name')}"></td>
+					<td th:text="${item.get('draw_time')}"></td>
+					<td th:text="${item.get('closure_time')}"></td>
+					<td> 
+						<div th:if="${item.status==1 || item.status==2 || item.status==3 || item.status==4}">
+							<a th:if="${item.get('ems_time')==null }" style="color: red" href="javascript:;" th:onclick="'emsCardMaterial(\''+${item.id}+'\',\'1\')'" class="tablelink">添加物流</a> 
+							<a th:if="${item.get('ems_time')!=null }" href="javascript:;" th:onclick="'emsCardMaterial(\''+${item.id}+'\',\'2\')'" class="tablelink">查看物流</a> 
+						</div>
+					</td>
+					<td th:text="${item.get('ems_time')}"></td>
 			</tr>
 		</tbody>
 	</table>
@@ -148,6 +163,25 @@
 			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
 		},3000);
 	});
+	
+	
+	function emsCardMaterial(id,type){
+		var title="添加物流";
+		if(type==2){
+			title="查看物流";
+		}
+		parent.layer.open({
+		    type: 2,
+		    title: title,
+		    closeBtn: 1, //不显示关闭按钮
+		    shift: 0.8,
+		    offset: '100px',
+		    area: ['40%', '70%'],
+		    content: '[[${sysUrl}]]/sys/award/sncode/ems.html?id='+id+"&type="+type
+		});
+	}
+	
+	
 </script>
 
 

src/main/resources/templates/sys/award/stock/list.html

@@ -1,113 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
-</head>
-<style>
-	.tablelink{margin-right:10px;}
-	.stylecss{
-	      color: red;
-	}
-	.select_width{
-	     width: 220px;
-	}
-	.date_width{
-	     width: 150px;
-	}
-</style>
-<body>
-<div class="place">
-	<span>位置：</span>
-	<ul class="placeul">
-		<li><a href="#">新版抽奖管理</a></li>
-		<li><a href="#">奖品物资管理</a></li>
-	</ul>
-</div>
-<div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/award/stock/list.html}" method="post">
-	<ul class="seachform">
-		
-		<li>
-			<label>奖品：</label>
-			<input type="text" id="name" name="name" autocomplete="off"  th:value="${search.get('name')}"  class="scinput date_width" placeholder="奖品名称">
-		</li>
-	
-		<li>
-			<label>奖品等奖</label>
-			<select class="scinput select_width"  id="level" name="level"   style="width: 150px;" >
-				<option value="">全部</option>
-				<option value="1" th:selected="${search.get('level')+'' eq '1' ? true : false}">一等奖</option>
-				<option value="2" th:selected="${search.get('level')+'' eq '2' ? true : false}">二等奖</option>
-				<option value="3" th:selected="${search.get('level')+'' eq '3' ? true : false}">三等奖</option>
-			</select>
-		</li>
-		<li>
-			<input type="button" class="scbtn" value="查询" />
-		</li>
-		
-	</ul>
-	</form>
-	<table class="tablelist">
-		<thead>
-		    <tr>
-				<th style="width: 50px;">序号</th>
-				<th>奖品名称</th>
-				<th>等级</th>
-				<th>库存数量</th>
-				<th>已用库存</th>
-				<th>兑换积分</th>
-		    	<th>奖品LOGO</th>
-		    	
-		    	<th>分发明细</th>
-<!-- 		    	<th>奖码明细</th> -->
-		    </tr>
-		</thead>
-		<tbody>
-			<tr th:each="item:${list}" >
-					<td th:text="${itemStat.count}"></td>
-					<td th:text="${item.get('name')}"></td>
-					<td  th:switch="${item.level}">
-					   <span th:case="1" style="color:red">一等奖</span>
-					   <span th:case="2" style="color:red">二等奖</span>
-					   <span th:case="3" style="color:red">三等奖</span>
-					   <span th:case="4" style="color:red">四等奖</span>
-					</td>
-					<td th:text="${item.get('stock_number')}"></td>
-					<td th:text="${item.get('use_number')}"></td>
-					<td th:text="${item.get('exchange_integral')}"></td>
-					<td >
-						<img style="height: 40px;"  th:if="${item.get('img')!=null && item.get('img')!=''}" th:src="${imgUrl+item.get('img')}">
-					</td>
-					<td> 
-						<a th:href="${sysUrl+'/sys/award/material/consume.html?id='+item.id }" class="tablelink">奖品配送明细</a> 
-					</td>
-<!-- 					<td>  -->
-<!-- 						<a th:href="${sysUrl+'/sys/award/sncode/list.html?awardMaterialId='+item.id }" class="tablelink">奖品抽奖信息</a>  -->
-<!-- 					</td> -->
-					
-			</tr>
-		</tbody>
-	</table>
-	<!-- 分页 -->
-	<div class="pagin">
-		<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
-		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
-	</div>
-	
-</div>
-</body>
-<script type="text/javascript">
-
-	$("#button").on('click',function(){
-		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list";
-		$("#seachform").submit();
-		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/award/material/list.html";
-		},3000);
-	});
-</script>
-
-
-</html>