--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/samplebookapply/QueryFgBookFeedBackForm.java

 package com.zrqx.core.form.member.fg.samplebookapply;
 
-import com.zrqx.core.model.member.samplebookapply.BookFeedBack;
-
-import io.swagger.annotations.ApiModelProperty;
+import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
 import lombok.Data;
 
 @Data
-public class QueryFgBookFeedBackForm extends BookFeedBack{
+public class QueryFgBookFeedBackForm extends SampleBookApply{
 
-	@ApiModelProperty("样书申请记录id")
-	private Integer recordId;
+	
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/member/samplebookapply/SampleBookApply.java

@@ -58,6 +58,8 @@ public class SampleBookApply extends BaseModel{
 	private String departmentName;
 	@ApiModelProperty("学校id")
 	private Integer relationId;
+	@ApiModelProperty("text反馈值JSON格式")
+	private String value;
 	/** 冗余字段*/
 	@ApiModelProperty("用户名称")
 	private String memberName;

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

@@ -11,7 +11,6 @@ import com.zrqx.bg.member.mapper.samplebookvoucher.FgSampleBookVoucherMapper;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.member.samplebookapply.SampleBookApplyApplyStatusEnum;
 import com.zrqx.core.enums.member.scorerecord.ScoreRecordSourceEnum;
-import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.fg.samplebookapply.QueryFgBookFeedBackForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.member.Member;
@@ -52,12 +51,12 @@ public class FgBookFeedBackServiceImpl extends BaseModelServiceImpl<BookFeedBack
 	@Override
 	public boolean feedBack(QueryFgBookFeedBackForm model) {
 		Member member = redis.getMember();
-		model.setStatus(SampleBookApplyApplyStatusEnum.ALREADY_FEEDBACK.getCode());
-		model.setMemberId(member.getId());
-		BookFeedBack bb = BeanUtils.copy(model, BookFeedBack.class);
-		fgBookFeedBackMapper.updateByPrimaryKeySelective(bb);
-		SampleBookApply sb = fgSampleBookApplyMapper.selectByPrimaryKey(model.getRecordId());
+		SampleBookApply sb = fgSampleBookApplyMapper.selectByPrimaryKey(model.getId());
 		sb.setApplyStatus(SampleBookApplyApplyStatusEnum.ALREADY_FEEDBACK.getCode());
+		sb.setValue(model.getValue());
+		sb.setUpdater(member.getId().toString());
+		sb.setUpdaterName(member.getName());
+		sb.setUpdateTime(new Date());
 		fgSampleBookApplyMapper.updateByPrimaryKey(sb);
 		//获取意见反馈设置的积分
 		ScoreSet set = fgScortSetMapper.getScoreSet();
@@ -75,11 +74,9 @@ public class FgBookFeedBackServiceImpl extends BaseModelServiceImpl<BookFeedBack
 			fgScoreMapper.updateByExampleSelective(score, example);
 		}else{
 			Score s = new Score();
+			super.beforeInsert(s);
 			s.setValue(value);
 			s.setMemberId(member.getId().toString());
-			s.setCreater(member.getId().toString());
-			s.setCreaterName(member.getName());
-			s.setCreateTime(new Date());
 			fgScoreMapper.insert(s);
 		}
 		

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

 package com.zrqx.bg.member.service.samplebookapply;
 
-import java.util.List;
 
 import org.springframework.web.bind.annotation.RequestBody;
-
-import com.zrqx.core.form.member.bg.member.samplebookapply.QuerySampleBookApplyForm;
 import com.zrqx.core.form.member.fg.samplebookapply.FgQuerySampleBookApplyForm;
 import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.fg.samplebookapply.FgSampleBookApplyVo;
-
 public interface FgSampleBookApplyService extends BaseService<SampleBookApply,Integer>{
 
 	/**

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

@@ -125,6 +125,7 @@ public class FgSampleBookApplyServiceImpl extends BaseModelServiceImpl<SampleBoo
 		if(member.getRelationId() != null){
 			form.setRelationId(member.getRelationId());
 		}
+		super.beforeInsert(form);
 		sampleBookApplyMapper.insertSelective(form);
 		//若申请，则用户样书券数量-1
 		Example example = new Example(SampleBook.class);