--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/service/bargaining/FgBargainingSerivceImpl.java

@@ -15,9 +15,11 @@ import com.zrqx.core.client.form.order.GoodsForm;
 import com.zrqx.core.client.order.fg.FgOrderClient;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.AllResourceTypeEnum;
+import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.datatype.StringUtils;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.form.fg.bargaining.BargainingForm;
 import com.zrqx.resource.commons.model.bargaining.Bargaining;
@@ -52,67 +54,72 @@ public class FgBargainingSerivceImpl extends BaseServiceImpl<Bargaining, String>
 		BeanUtils.copyProperties(form, bargaining);
 		bargaining.setCreateDate(new Date());
 		Random random = new Random();
+		if(StringUtils.isBlank(form.getHelpMemberId()) ) {
+			throw new BaseException(2,"请您授权登录");
+		}
 		// 砍价钱
 		// 1类型 99砍价 68.99
 		if (bargaining.getType() == 1) {
-			BigDecimal price = new BigDecimal(68.99);
+			BigDecimal price = new BigDecimal(98.99);
 			// 查询当前总金额
 			BigDecimal queryPrice = mapper.queryPrice(bargaining.getShareMemberId(),bargaining.getType());
-			if (bargaining.getHelpMemberId().equals(bargaining.getShareMemberId())) {
-				bargaining.setPrice(new BigDecimal(30));
-			} else {
+//			if (bargaining.getHelpMemberId().equals(bargaining.getShareMemberId())) {
+//				bargaining.setPrice(new BigDecimal(10+random.nextDouble()*5));
+//			} else {
 				// 查询次数
 				Integer count = mapper.queryCount(bargaining.getShareMemberId(),bargaining.getType());
-				if (count == 8) {
+				if (count == 9) {
 					// 最后一次金额
 					bargaining.setPrice(price.subtract(queryPrice));
 					System.out.println(queryPrice);
 					System.out.println(price.subtract(queryPrice));
 					System.out.println(bargaining.getPrice());
-				} else if(count<8){
-					// 剩余钱数
-					BigDecimal intPrice = price.subtract(queryPrice);
-					// 总次数
-					BigDecimal sumcount = new BigDecimal(9);
-					// 剩余次数
-					BigDecimal discount = sumcount.subtract(new BigDecimal(count));
-					// 随机
-					Integer maxInt = intPrice.divide(discount, 0, BigDecimal.ROUND_DOWN).intValue();
-					int s = random.nextInt(maxInt) % (maxInt) + 1;
-					bargaining.setPrice(new BigDecimal(s));
+				} else if(count<9){
+					if(count==1) {
+						bargaining.setPrice(new BigDecimal(10+random.nextDouble()*5));
+					}
+					/*
+					 * // 剩余钱数 BigDecimal intPrice = price.subtract(queryPrice); // 总次数 BigDecimal
+					 * sumcount = new BigDecimal(9); // 剩余次数 BigDecimal discount =
+					 * sumcount.subtract(new BigDecimal(count)); // 随机 Integer maxInt =
+					 * intPrice.divide(discount, 0, BigDecimal.ROUND_DOWN).intValue(); int s =
+					 * random.nextInt(maxInt) % (maxInt) + 1;
+					 */
+					bargaining.setPrice(new BigDecimal(9+random.nextDouble()*2));
 				}else {
 					return true;
 				}
 			}
-		}
+//		}
 		// 50砍价 29.1
 		if (bargaining.getType() == 2) {
-			BigDecimal price = new BigDecimal(29.1);
+			BigDecimal price = new BigDecimal(49.1);
 			// 查询当前总金额
 			BigDecimal queryPrice = mapper.queryPrice(bargaining.getShareMemberId(),bargaining.getType());
-			if (bargaining.getHelpMemberId().equals(bargaining.getShareMemberId())) {
-				bargaining.setPrice(new BigDecimal(20));
-			} else {
+//			if (bargaining.getHelpMemberId().equals(bargaining.getShareMemberId())) {
+//				bargaining.setPrice(new BigDecimal(15+random.nextDouble()*5));
+//			} else {
 				// 查询次数
 				Integer count = mapper.queryCount(bargaining.getShareMemberId(),bargaining.getType());
-				if (count == 3) {
+				if (count == 4) {
 					// 最后一次金额
 					bargaining.setPrice(price.subtract(queryPrice));
-				} else if(count<3) {
-					// 剩余钱数
-					BigDecimal intPrice = price.subtract(queryPrice);
-					// 总次数
-					BigDecimal sumcount = new BigDecimal(4);
-					// 剩余次数
-					BigDecimal discount = sumcount.subtract(new BigDecimal(count));
-					// 随机
-					Integer maxInt = intPrice.divide(discount, 0, BigDecimal.ROUND_DOWN).intValue();
-					int s = random.nextInt(maxInt) % (maxInt) + 1;
-					bargaining.setPrice(new BigDecimal(s));
+				} else if(count<4) {
+					if(count==1) {
+						bargaining.setPrice(new BigDecimal(10+random.nextDouble()*5));
+					}
+					/*
+					 * // 剩余钱数 BigDecimal intPrice = price.subtract(queryPrice); // 总次数 BigDecimal
+					 * sumcount = new BigDecimal(4); // 剩余次数 BigDecimal discount =
+					 * sumcount.subtract(new BigDecimal(count)); // 随机 Integer maxInt =
+					 * intPrice.divide(discount, 0, BigDecimal.ROUND_DOWN).intValue(); int s =
+					 * random.nextInt(maxInt) % (maxInt) + 1;
+					 */
+					bargaining.setPrice(new BigDecimal(8.5+random.nextDouble()*1.5));
 				}else {
 					return true;
 				}
-			}
+//			}
 			
 		}
 		mapper.insert(bargaining);