审核不通过的时候将样书券返回给用户

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/samplebookapply/SampleBookApplyController.java

 package com.zrqx.bg.member.controller.samplebookapply;
 
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zrqx.bg.member.mapper.scoreset.ScoreSetMapper;
 import com.zrqx.bg.member.service.samplebookvoucher.SampleBookService;
 import com.zrqx.bg.member.service.scoreset.ScoreService;
+import com.zrqx.bg.member.service.scoreset.ScoreSetService;
 import com.zrqx.core.model.member.samplebookvoucher.SampleBook;
 import com.zrqx.core.model.member.scorerecord.Score;
+import com.zrqx.core.model.member.scorerecord.ScoreSet;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +65,9 @@ public class SampleBookApplyController {
 
 	@Autowired
 	private SampleBookService sampleBookService;
+
+	@Autowired
+	private ScoreSetService scoreSetService;
 	
 	
 	@ApiOperation(value = "样书券列表", notes = "分页查询样书券列表")
@@ -124,19 +132,18 @@ public class SampleBookApplyController {
 		entity.setApplyStatus(form.getStatus());
 		//若审核未通过需将样书券返回给用户
 		if(SampleBookApplyApplyStatusEnum.FAIL_REVIEW.getCode().equals(form.getStatus())){
-			SampleBook sampleBook = new SampleBook();
-			sampleBook.setMemberId(entity.getMemberId());
-			SampleBook s = new SampleBook();
-			try {
-				s = sampleBookService.selectOne(sampleBook);
-			} catch (Exception e) {
-				e.printStackTrace();
-				log.debug("获取用户样书券信息异常");
-			}
-			if(s != null){
-				s.setNumber(s.getNumber() + 1);
-			}
-			sampleBookService.updateByPrimaryKey(s);
+			ScoreSet ss = scoreSetService.getScoreSet();
+			//向样书券表中写入数据
+			SampleBook sb = new SampleBook();
+			sb.setMemberId(entity.getMemberId());
+			sb.setNumber(1);
+			Calendar curr = Calendar.getInstance();
+			curr.set(Calendar.MONTH,curr.get(Calendar.MONTH)+ss.getMonthNumber());
+			Date date=curr.getTime();
+			sb.setOverdueTime(date);
+			sb.setAlreadyNum(0);
+			sampleBookService.insert(sb);
+
 		}
 
 		return CallBack.success(sampleBookApplyService.updateByPrimaryKey(entity));

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/scoreset/ScoreSetMapper.java

@@ -12,4 +12,7 @@ public interface ScoreSetMapper extends BaseMapper<ScoreSet>{
 	@Select("select * from me_score_set")
 	ScoreSet getScoreSetInfo();
 
+	@Select("select commentGoods,creater,createrName,createTime,DATE_FORMAT(endTime,'%Y-%m-%d') endTime,feedBack,id,score,signFifteen,signFive,signScore,signTen,text,updater,updaterName,updateTime,monthNumber from me_score_set")
+	ScoreSet getScoreSet();
+
 }

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/scoreset/ScoreSetService.java

@@ -5,6 +5,6 @@ import com.zrqx.core.service.BaseService;
 
 public interface ScoreSetService extends BaseService<ScoreSet,Integer>{
 
-	
+    ScoreSet getScoreSet();
 
 }

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/scoreset/ScoreSetServiceImpl.java

 package com.zrqx.bg.member.service.scoreset;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.zrqx.bg.member.mapper.scoreset.ScoreSetMapper;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.scorerecord.ScoreSet;
 import com.zrqx.core.service.BaseModelServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 @Service
 public class ScoreSetServiceImpl extends BaseModelServiceImpl<ScoreSet,Integer> implements ScoreSetService{
 	@Autowired
@@ -16,6 +15,8 @@ public class ScoreSetServiceImpl extends BaseModelServiceImpl<ScoreSet,Integer>
 		return scoreSetMapper;
 	}
 
-	
-
+	@Override
+	public ScoreSet getScoreSet() {
+		return scoreSetMapper.getScoreSet();
+	}
 }

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/samplebookapply/FgSampleBookApplyServiceImpl.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.zrqx.core.vo.member.fg.samplebookvoucher.FgSampleBookVo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/samplebookvoucher/FgSampleBookService.java

 package com.zrqx.bg.member.service.samplebookvoucher;
 
 
-import java.util.Date;
-
 import com.zrqx.core.model.member.samplebookvoucher.SampleBook;
 import com.zrqx.core.service.BaseService;
 
+import java.util.Date;
+
 public interface FgSampleBookService extends BaseService<SampleBook,Integer> {
 	
 	/**
@@ -38,7 +38,7 @@ public interface FgSampleBookService extends BaseService<SampleBook,Integer> {
 	 * @author zzg
 	 * @date: 2019年5月17日 下午5:17:29
 	 */
-	boolean reduce(Integer applyNum);
+	 boolean reduce(Integer applyNum);
 	
 	/**
 	  * 保存样书券申请记录