stripe

src/main/java/com/example/afrishop_v3/controllers/StripeController.java

@@ -64,7 +64,7 @@ public class StripeController extends Controller {
     }
 
     @PostMapping("/payment")
-    public Result payment(@RequestParam Map<String, Object> params) {
+    public Result payment(@RequestParam Map<String, Object> params) throws StripeException {
         Result result = new Result();
         logger.info("stripe支付开始~~~");
         try {
@@ -97,8 +97,6 @@ public class StripeController extends Controller {
                     createFinance(charge.getId(), charge.getReceiptUrl(), order);
                     //3）、生成佣金
                     Bonus bonus = new Bonus();
-                    TbCfUserInfo userInfo = new TbCfUserInfo();
-                    userInfo.setUserId(order.getUserId());
                     bonus.setOrderId(orderId);
                     bonus.setAmount(order.getItemsPrice());
 
@@ -148,7 +146,7 @@ public class StripeController extends Controller {
         tbCfFinance.setPayId(paymentId);
         tbCfFinance.setPayTime(new Date());
         tbCfFinance.setReceiptUrl(url);
-        tbCfFinance.setPayWayCode("paypal");
+        tbCfFinance.setPayWayCode("stripe");
         tbCfFinance.setUserId(tbCfOrderVo.getUserId());
         financeRepository.save(tbCfFinance);
         return tbCfFinance;
@@ -222,6 +220,7 @@ public class StripeController extends Controller {
                     }
 
                     TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
+                    if (sharer.isPresent() || postOptional.isPresent() || bonusInc != null)
                         runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                     //runBonusInc(bonusInc, amount, 0);
                 }
@@ -233,7 +232,7 @@ public class StripeController extends Controller {
     }
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
-        if (user == null) return null;
+        logger.info("user:" + user);
         Optional<Network> userCode = networkRepository.findFirstByNetworkInfoCode(user.getCode());
         if (userCode.isPresent() || direct) {
             TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();