--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/controller/FgMemberController.java

@@ -83,26 +83,31 @@ public class FgMemberController {
 	@ApiOperation(value = "修改抽奖次数(分享只有第一次有抽奖次数)", notes = "修改抽奖次数(分享只有第一次有抽奖次数)")
 	@PostMapping(value = MemberRequestPath.UPDATE + MemberRequestPath.PRIAZE)
 	public CallBack<Boolean> updatePrizecount(@RequestBody FgSaveMemberForm form) {
-		System.out.println(form);
+		
 		Member member = service.selectByPrimaryKey(form.getId());
 		if (member == null) {
 			throw new ParameterValidateException("用户id错误！");
 		}
+		if(member.getSumPrizeCount()<10) {
 		// 分享
 		if (form.getStatus() == 1) {
 			//是否第一次点赞
 			if (member.getPrizeCountType() == 1) {
 				member.setPrizeCount(member.getPrizeCount() + 1);
 				member.setPrizeCountType(2);
+				member.setSumPrizeCount(member.getSumPrizeCount() + 1);
 			}
 		}
 		// 分享点击
 		if (form.getStatus() == 2) {
 			member.setPrizeCount(member.getPrizeCount() + 1);
+			member.setSumPrizeCount(member.getSumPrizeCount() + 1);
 			System.out.println(form.getQuanlili() +"次数 ：" +member.getPrizeCount());
 		}
+		service.updateByPrimaryKey(member);
+		}
 		
-		return CallBack.success(service.updateByPrimaryKey(member));
+		return CallBack.success(true);
 	}
 
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/controller/FgMemberPriazeController.java

@@ -66,7 +66,7 @@ public class FgMemberPriazeController {
 	@ApiOperation(value = "抽奖", notes = "抽奖")
 	@PostMapping(value = MemberRequestPath.SAVE)
 	public CallBack<MemberPriaze> save(@RequestBody FgSaveMemberForm form) {
-		double ran= Math.random()*100;
+		double ran= Math.random()*1000;
 		int random= (int)ran;
 		MemberPriaze memberPriaze = new MemberPriaze();
 		memberPriaze.setMemberId(form.getId());
@@ -77,38 +77,38 @@ public class FgMemberPriazeController {
 		Integer count = mapper.countPriaze();
 		
 		
-		if(list.size()<3 && count<=9800) {
+		if(list.size()<2 && count<=11800) {
 			//随机数小于等于60
-		if(random<60) {
+		if(random<951) {
 			memberPriaze.setPrizename(MemberPriazeEnum.MemberPriaze_5.getValue());
 			memberPriaze.setPrizeState(MemberPriazeEnum.MemberPriaze_5.getCode());
 		}
-		//百分之25
-        if(random>=60 && random<85) {
+		//百分之4
+        if(random>=951 && random<991) {
         	memberPriaze.setPrizedate(new Date());
 			memberPriaze.setPrizename(MemberPriazeEnum.MemberPriaze_1.getValue());
 			memberPriaze.setPrizeState(MemberPriazeEnum.MemberPriaze_1.getCode());
 			memberPriaze.setPrizetype(2);
 			service.insert(memberPriaze);
 		}
-        //百分之12
-        if(random>=85 && random<97) {
+        //百分之0.7
+        if(random>=991 && random<997) {
         	memberPriaze.setPrizedate(new Date());
 			memberPriaze.setPrizename(MemberPriazeEnum.MemberPriaze_2.getValue());
 			memberPriaze.setPrizeState(MemberPriazeEnum.MemberPriaze_2.getCode());
 			memberPriaze.setPrizetype(2);
 			service.insert(memberPriaze);
 		}
-        //百分之2
-        if(random>=97 && random<99) {
+        //百分之0.2
+        if(random>=997 && random<999) {
         	memberPriaze.setPrizedate(new Date());
 			memberPriaze.setPrizename(MemberPriazeEnum.MemberPriaze_3.getValue());
 			memberPriaze.setPrizeState(MemberPriazeEnum.MemberPriaze_3.getCode());
 			memberPriaze.setPrizetype(2);
 			service.insert(memberPriaze);
 		}
-        //百分之1
-        if(random>=99) {
+        //百分之0.1
+        if(random>=999) {
         	memberPriaze.setPrizedate(new Date());
 			memberPriaze.setPrizename(MemberPriazeEnum.MemberPriaze_4.getValue());
 			memberPriaze.setPrizeState(MemberPriazeEnum.MemberPriaze_4.getCode());
@@ -120,6 +120,7 @@ public class FgMemberPriazeController {
 		}
         Member member = memberService.selectByPrimaryKey(form.getId());
         member.setPrizeCount(member.getPrizeCount() - 1);
+        member.setPrizeDate(new Date());
         memberService.updateByPrimaryKeySelective(member);
 		return CallBack.success(memberPriaze);
 	}