Quellcode durchsuchen

认证短信提醒BUG修复

anderx vor 7 Jahren
Ursprung
Commit
0c01cfea22

+ 12 - 14
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -782,25 +782,23 @@ public class PublicController extends BaseController {
 		res.setData(pagination);
 		return res;
 	}
-	@RequestMapping(value = "/InvitationCode", method = RequestMethod.GET)
+	
+	@RequestMapping(value = "/getUserVoucher", method = RequestMethod.GET)
 	@ResponseBody
-	public Result InvitationCode() {
+	public Result getUserVoucher(String uid,Integer pageNo,Integer pageSize){
 		Result res = new Result();
-		res.data(InvitationCodeUtils.toSerialCode(new Date().getTime()));
+		res.data(voucherService.selectVoucherList(null,1,1,4,uid, pageNo, pageSize));
 		return res;
 	}
-	@RequestMapping(value = "/getVoucher", method = RequestMethod.POST)
+	@RequestMapping(value = "/userGetVoucher", method = RequestMethod.POST)
 	@ResponseBody
-	public void getVoucher(String uid){
-		List<String> ids=voucherService.getSourceVoucher(0);
-		for (String s : ids) {
-			JtVoucherDetail j=new JtVoucherDetail();
-			j.setId(jDBCIdGenerator.generateId().toString());
-			j.setReceiveTime(new Date());
-			j.setVoucherId(s);
-			j.setUseUid(uid);
-			j.setStatus(0);
-			voucherDetailService.saveVoucherDetail(j);
+	public Result userGetVoucher(String uid,String vid){
+		Result res = new Result();
+		if(StringUtils.isBlank(uid)&&TokenManager.getUserId()!=null)uid=TokenManager.getUserId();
+		if(StringUtils.isBlank(vid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","抵用券"));
 		}
+		res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
+		return res;
 	}
 }

+ 7 - 8
src/main/java/com/goafanti/common/mapper/JtVoucherMapper.xml

@@ -356,17 +356,16 @@
    from jt_voucher
    where 1=1
    <if test="uid != null">
-   		and limitUse= 1
-		and  granting_uid = #{uid,jdbcType=VARCHAR} 
-		</if>
+   		and  granting_uid = #{uid,jdbcType=VARCHAR} 
+	</if>
    <if test="name != null">
 		and  name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>  
 	<if test="limitUse != null">
-		and  limitUse  = #{limitUse,jdbcType=INTEGER}
+		and  limit_use  = #{limitUse,jdbcType=INTEGER}
 	</if>
 	<if test="activeState != null">
-		and  activeState = #{activeState,jdbcType=INTEGER}
+		and  active_state = #{activeState,jdbcType=INTEGER}
 	</if>
 	<if test="source != null">
 		and  source = #{source,jdbcType=INTEGER}
@@ -389,13 +388,13 @@
 		and  name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>  
 	<if test="limitUse != null">
-		and  limitUse  = #{limitUse,jdbcType=INTEGER}
+		and  limit_use  = #{limitUse,jdbcType=INTEGER}
 	</if>
 	<if test="activeState != null">
-		and  activeState = #{activeState,jdbcType=INTEGER}
+		and  active_state = #{activeState,jdbcType=INTEGER}
 	</if>
 	<if test="source != null">
-		and  source = #{name,jdbcType=INTEGER}
+		and  source = #{source,jdbcType=INTEGER}
 	</if>
   </select>
   

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -66,7 +66,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
 
 @RestController
-@RequestMapping(value = "/open/api/user")
+@RequestMapping(value = "/api/user")
 public class UserApiController extends BaseApiController {
 	@Resource
 	private UserService						userService;

+ 3 - 3
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -620,6 +620,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if(collectFlag){
 		ExpertsListBo u=userIdentityMapper.selectByIdentityId(identity.getId());
 		String str="";
+		if(u.getExpert()==2&&u.getConsultantType() == 4)str="法律顾问";
+		if(u.getExpert()==2&&u.getConsultantType() != 4)str="顾问";
 		if (identity.getAuditStatus()==2) {
 				JtCollectSearch r=new JtCollectSearch();
 				if(u.getExpert()==1){
@@ -628,10 +630,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				if(u.getExpert()==2){
 					if(u.getConsultantType() == 4){
 						r.setFromTable(collectType.LEGAL_ADVISER.getDesc());
-						str="法律顾问认证";
 					}else{
 						r.setFromTable(collectType.ADVISER.getDesc());
-						str="顾问认证";
 					}
 					//通过后短信通知
 					examineSendMessage(u, str, examineAdopt);
@@ -661,7 +661,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	private void examineSendMessage(ExpertsListBo u, String str, String code) {
 		//String paramString = "{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"技淘网\"}";
-		String paramString = "{\"audit\":\"" + str  + "}";
+		String paramString = "{\"audit\":\"" + str  + "\"}";
 		String regex = "^(1[1-9][0-9])\\d{8}$";
 		Pattern p = Pattern.compile(regex);
 		if (null!=u.getMobile()) {

+ 1 - 4
src/main/java/com/goafanti/voucher/controller/AdminVoucherController.java

@@ -57,11 +57,10 @@ public class AdminVoucherController extends CertifyApiController {
 	 @RequestMapping(value = "/selectList" ,method=RequestMethod.GET)
 	 public Result selectVoucherList(String name,Integer limitUse,Integer activeState,Integer source,Integer pageNo,Integer pageSize){
 		 Result result=new Result();
-		 result.data(voucherService.selectVoucherList(name, limitUse, activeState, source, pageNo, pageSize));
+		 result.data(voucherService.selectVoucherList(name, limitUse, activeState, source,null, pageNo, pageSize));
 		 return result;
 	 }
 	 private Result chack(JtVoucher voucher, Result result) {
-		
 		if(StringUtils.isBlank(voucher.getName())) {
 	    		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));return result;
 	    	}
@@ -74,8 +73,6 @@ public class AdminVoucherController extends CertifyApiController {
 	    if(voucher.getDurationDay()==null) {
 	    		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"使用期限","使用期限"));return result;
 	    	}
-	    
-    
 	    return result;
 	}
 }

+ 1 - 1
src/main/java/com/goafanti/voucher/controller/UserVoucherController.java

@@ -60,7 +60,7 @@ public class UserVoucherController extends CertifyApiController {
 	 @RequestMapping(value = "/selectList" ,method=RequestMethod.GET)
 	 public Result selectVoucherList(String name,Integer limitUse,Integer activeState,Integer source,Integer pageNo,Integer pageSize){
 		 Result result=new Result();
-		 result.data(voucherService.selectVoucherList(name, limitUse, activeState, source, pageNo, pageSize));
+		 result.data(voucherService.selectVoucherList(name, limitUse, activeState, source, null,pageNo, pageSize));
 		 return result;
 	 }
 	 @RequestMapping(value = "/selectDetailList" ,method=RequestMethod.GET)

+ 2 - 0
src/main/java/com/goafanti/voucher/service/VoucherDetailService.java

@@ -14,6 +14,8 @@ public interface VoucherDetailService {
 	JtVoucherDetail selectVoucherDetail(String id);
 	
 	Pagination<JtVoucherDetailListBo> selectVoucherDetailList(String name,Integer limitUse,String userMobile,Integer source,Integer sort,Integer sortType,Integer pageNo,Integer pageSize);
+
+	int saveUserGetVoucher(String uid, String vid);
 	
 	
 }

+ 1 - 1
src/main/java/com/goafanti/voucher/service/VoucherService.java

@@ -15,7 +15,7 @@ public interface VoucherService {
 	
 	JtVoucher selectVoucher(String id);
 	
-	Pagination<JtVoucherListBo> selectVoucherList(String name,Integer limitUse,Integer activeState,Integer source,Integer pageNo,Integer pageSize);
+	Pagination<JtVoucherListBo> selectVoucherList(String name,Integer limitUse,Integer activeState,Integer source,String uid,Integer pageNo,Integer pageSize);
 	
 	
 	List<String> getSourceVoucher(Integer source);

+ 17 - 0
src/main/java/com/goafanti/voucher/service/impl/VoucherDetailServiceImpl.java

@@ -2,10 +2,13 @@ package com.goafanti.voucher.service.impl;
 
 
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,7 @@ import com.goafanti.common.model.JtVoucherDetail;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.voucher.bo.JtVoucherDetailListBo;
@@ -27,6 +31,8 @@ public class VoucherDetailServiceImpl extends BaseMybatisDao<JtVoucherDetailMapp
 
 	@Autowired
 	JtVoucherDetailMapper jtVoucherDetailMapper;
+	@Resource
+	private JDBCIdGenerator	jDBCIdGenerator;
 
 	@Override
 	public int saveVoucherDetail(JtVoucherDetail voucher) {
@@ -76,6 +82,17 @@ public class VoucherDetailServiceImpl extends BaseMybatisDao<JtVoucherDetailMapp
 				return pagination;
 	}
 
+	@Override
+	public int saveUserGetVoucher(String uid, String vid) {
+		JtVoucherDetail j=new JtVoucherDetail();
+		j.setId(jDBCIdGenerator.generateId().toString());
+		j.setReceiveTime(new Date());
+		j.setVoucherId(vid);
+		j.setUseUid(uid);
+		j.setStatus(0);
+		return  jtVoucherDetailMapper.insertSelective(j);
+	}
+
 	
 
 	

+ 3 - 2
src/main/java/com/goafanti/voucher/service/impl/VoucherServiceImpl.java

@@ -52,7 +52,7 @@ public class VoucherServiceImpl extends BaseMybatisDao<JtVoucherMapper> implemen
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<JtVoucherListBo> selectVoucherList(String name, Integer limitUse, Integer activeState, Integer source,
-			Integer pageNo, Integer pageSize) {
+			String uid,Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<>();
 		if (pageNo==null||pageNo<1) pageNo=1;
 		if (pageSize==null||pageSize<1) pageSize=10;
@@ -60,7 +60,8 @@ public class VoucherServiceImpl extends BaseMybatisDao<JtVoucherMapper> implemen
 		if (null != limitUse) params.put("limitUse", limitUse);
 		if (null != activeState) params.put("activeState", activeState);
 		if (null != source) params.put("source", source);
-		if(TokenManager.getToken() instanceof User)params.put("uid", TokenManager.getUserId());
+		if(uid==null&&TokenManager.getToken() instanceof User)params.put("uid", TokenManager.getUserId());
+		if (StringUtils.isNotBlank(uid))params.put("uid", uid);
 		//params.put("uid", "1");
 		return (Pagination<JtVoucherListBo>) findPage("selectVoucherList", "selectVoucherCount",params,
 				pageNo, pageSize);

+ 5 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -54,7 +54,11 @@
 								<input type="text" name="cellCode" placeholder="手机验证码" id="photo_num"/>
 							</div>
 							<input type="button" id="photo" value="获取验证码" disabled/>
-						</div>												
+						</div>	
+						<div class="zhuce_input">
+							<img th:src="${portalHost+'/img/resiger_photo300.jpg'}" alt=""/>
+							<input type="text" name="beInviteCode" placeholder="请输入邀请码" id="beInviteCode" autocomplete="off"/>
+						</div>											
 						<div class="protocol">
 							<label for="protocol" class="protocol_lab cheackeds_no">
 								<input type="checkbox" name="pro" id="protocol"/>