diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index 120e25b..9179923 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -12,6 +12,8 @@ import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService; +import org.jeecg.modules.cityMoneyLog.entity.CityMoneyLog; +import org.jeecg.modules.cityMoneyLog.service.ICityMoneyLogService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.service.AppletLoginService; @@ -21,9 +23,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Random; /** * @Author lzx @@ -45,6 +49,9 @@ public class AppletLoginServiceImpl implements AppletLoginService { @Resource private ICityIntgerWaterService cityIntgerWaterService; + @Resource + private ICityMoneyLogService cityMoneyLogService; + @Resource private RedisUtil redisUtil; @Resource @@ -89,7 +96,7 @@ public class AppletLoginServiceImpl implements AppletLoginService { member = new HanHaiMember(); // member.setSesssionKey(sessionKey); member.setAppletOpenid(wxOpenid); - member.setNickName("瑶都墙友"+System.currentTimeMillis()); + member.setNickName(null); member.setHeadImage(loginReq.getHeadimgurl()); member.setShareId(loginReq.getShareId()); member.setVtime(new Date()); @@ -116,6 +123,32 @@ public class AppletLoginServiceImpl implements AppletLoginService { cityIntgerWaterService.save(cityMoneyLog); } + + //增加用户推荐奖金 + if (hanHaiMember != null) { + CityMoneyLog cityMoneyLog = new CityMoneyLog(); + cityMoneyLog.setCreateTime(new Date()); + + //获取0.01 - 2之间的随机数 + BigDecimal money = new BigDecimal(Math.random() * (2 - 0.01) + 0.01); + + BigDecimal bigDecimal = generateRandomMoney(); + + cityMoneyLog.setPrice(bigDecimal); + cityMoneyLog.setState(1); + cityMoneyLog.setType(1); + cityMoneyLog.setUserId(hanHaiMember.getId()); + cityMoneyLog.setTitle("推荐好友获得随机奖金"); + cityMoneyLogService.save(cityMoneyLog); + //增加奖金 + BigDecimal price = hanHaiMember.getPrice().add(new BigDecimal(5)); + hanHaiMember.setPrice(price); + } + + + + + //修改用户积分 hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(5))); memberService.updateById(hanHaiMember); @@ -165,6 +198,29 @@ public class AppletLoginServiceImpl implements AppletLoginService { } + public static BigDecimal generateRandomMoney() { + Random random = new Random(); + double randomValue; + double randomProbability = random.nextDouble(); // 生成一个0到1之间的随机数 + + if (randomProbability < 0.7) { + // 70%概率生成0.01到1之间的随机数 + randomValue = 0.01 + (1 - 0.01) * random.nextDouble(); + } else if (randomProbability < 0.9) { + // 20%概率生成1, 1.1, 1.2, ..., 1.9之间的特定数 + int choice = random.nextInt(10); // 0-9 + randomValue = 1.0 + choice * 0.1; + } else if (randomProbability < 0.99) { + // 9%概率生成2 + randomValue = 2.0; + } else { + // 1%概率生成5 + randomValue = 5.0; + } + + return new BigDecimal(randomValue).setScale(2, RoundingMode.HALF_UP); + } + // /** // * 微信小程序登录绑定手机号码接口 // * @param loginReq diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java index f0390e5..7e231d2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java @@ -218,7 +218,7 @@ public interface YaoDuApiService { Result withdraw(String token, CityMoneyLog bean); //根据商品查询店铺商品 - Result getGoodsList(String token,String shopId,PageBean pageBean); + Result getGoodsList(String shopId,PageBean pageBean); //我的店铺 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java index 1311004..351bd28 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java @@ -1646,8 +1646,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { @Override - public Result getGoodsList(String token,String shopId,PageBean pageBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getGoodsList(String shopId,PageBean pageBean){ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = cityShoppingService.lambdaQuery() .eq(CityShopping::getShopId, shopId) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java index 1f828fb..4cf6753 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java @@ -283,9 +283,9 @@ public class YaoDuApiTokenController { //查询商品信息列表根据关联店铺标识 @ApiOperation(value="查询商品信息列表根据关联店铺标识") @GetMapping("/getGoodsList") - public Result getGoodsList(@RequestHeader("X-Access-Token") String token,String shopId,PageBean pageBean) + public Result getGoodsList(String shopId,PageBean pageBean) { - return yaoDuApiService.getGoodsList(token,shopId,pageBean); + return yaoDuApiService.getGoodsList(shopId,pageBean); } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index a6afd56..7a58ab9 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8081 tomcat: max-swallow-size: -1 error: