提交 23b60c17 authored 作者: Whispa's avatar Whispa

commit

上级 43eb791c
...@@ -2,6 +2,7 @@ package com.example.afrishop_v3.controllers; ...@@ -2,6 +2,7 @@ package com.example.afrishop_v3.controllers;
import com.example.afrishop_v3.models.*; import com.example.afrishop_v3.models.*;
import com.example.afrishop_v3.repository.*; import com.example.afrishop_v3.repository.*;
import com.example.afrishop_v3.security.services.AuthenticationUser;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -13,21 +14,23 @@ import java.util.*; ...@@ -13,21 +14,23 @@ import java.util.*;
@RestController @RestController
@RequestMapping("/discover/bonus") @RequestMapping("/discover/bonus")
public class BonusController { public class BonusController extends Controller {
private final BonusRepository repository; private final BonusRepository repository;
private final ItemRepository itemRepository; private final ItemRepository itemRepository;
private final UserRepository userRepository; private final UserRepository userRepository;
private final PostRepository postRepository; private final PostRepository postRepository;
private final NetworkRepository networkRepository; private final NetworkRepository networkRepository;
private final EntityManager entityManager; private final EntityManager entityManager;
private final AuthenticationUser user;
public BonusController(BonusRepository repository, ItemRepository itemRepository, UserRepository userRepository, PostRepository postRepository, NetworkRepository networkRepository, EntityManager entityManager) { public BonusController(BonusRepository repository, ItemRepository itemRepository, UserRepository userRepository, PostRepository postRepository, NetworkRepository networkRepository, EntityManager entityManager, AuthenticationUser user) {
this.repository = repository; this.repository = repository;
this.itemRepository = itemRepository; this.itemRepository = itemRepository;
this.userRepository = userRepository; this.userRepository = userRepository;
this.postRepository = postRepository; this.postRepository = postRepository;
this.networkRepository = networkRepository; this.networkRepository = networkRepository;
this.entityManager = entityManager; this.entityManager = entityManager;
this.user = user;
} }
@GetMapping(value = "/listBonus") @GetMapping(value = "/listBonus")
...@@ -138,6 +141,9 @@ public class BonusController { ...@@ -138,6 +141,9 @@ public class BonusController {
@PostMapping(value = "/saveNetworkMarketing") @PostMapping(value = "/saveNetworkMarketing")
public Bonus saveNetworkMarketing(@ModelAttribute("Bonus") Bonus bonus) { public Bonus saveNetworkMarketing(@ModelAttribute("Bonus") Bonus bonus) {
TbCfUserInfo info = user.user();
Optional<String> userIdOptional = bonus.userId(); Optional<String> userIdOptional = bonus.userId();
double amount = bonus.getAmount(); double amount = bonus.getAmount();
...@@ -164,10 +170,14 @@ public class BonusController { ...@@ -164,10 +170,14 @@ public class BonusController {
if (user.invited()) { if (user.invited()) {
bonus.setAmount(amount * 10 / 100); double v = amount * 10 / 100;
bonus.setAmount(v);
bonus.setUserInfo(user); bonus.setUserInfo(user);
bonus.setPercentage(10); bonus.setPercentage(10);
bonus = repository.save(bonus); bonus = repository.save(bonus);
if( user.hasFcm() ){
sendNotification(user.getFcm(),"Bonus alert !!","Received bonus of $"+v+" in your account");
}
} }
...@@ -186,11 +196,19 @@ public class BonusController { ...@@ -186,11 +196,19 @@ public class BonusController {
if (userCode.isPresent()) { if (userCode.isPresent()) {
TbCfUserInfo me = userCode.get().getUserInfo(); TbCfUserInfo me = userCode.get().getUserInfo();
Bonus bonus = new Bonus(); Bonus bonus = new Bonus();
bonus.setUserInfo(direct ? user : me); TbCfUserInfo userInfo = direct ? user : me;
bonus.setAmount(amount * percent / 100); bonus.setUserInfo(userInfo);
double v = amount * percent / 100;
bonus.setAmount(v);
bonus.setPercentage(percent); bonus.setPercentage(percent);
bonus.setOrderId(orderId); bonus.setOrderId(orderId);
if (me.invited()) repository.save(bonus); if (userInfo.invited()){
repository.save(bonus);
bonus = repository.save(bonus);
if( userInfo.hasFcm() ){
sendNotification(userInfo.getFcm(),"Bonus alert !!","Received bonus of $"+v+" in your account");
}
}
return me; return me;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论