From 2685a4536643558a3c9885d4869ddae9a4fd529c Mon Sep 17 00:00:00 2001
From: qyhdd <q1049270714@163.com>
Date: Sat, 2 Sep 2023 20:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E8=B4=B9=E9=87=91=E9=A2=9D=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E9=9A=8F=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rights/controller/AliPayController.java   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java
index 5b5e187..5ee9173 100644
--- a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java
+++ b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java
@@ -19,6 +19,7 @@ import com.cyjd.rights.entity.ConfigEntity;
 import com.cyjd.rights.enums.AliPayEnum;
 import com.cyjd.rights.result.FResult;
 import com.cyjd.rights.utils.OrderUtil;
+import com.cyjd.rights.utils.PriceUtil;
 import com.cyjd.rights.vo.AliPayInOrderByAgreementReq;
 import com.cyjd.rights.vo.AliPayQueryPageSignReq;
 import com.cyjd.rights.vo.AliPayTradeQueryReq;
@@ -33,8 +34,11 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * @author :WXC
@@ -95,7 +99,9 @@ public class AliPayController {
     @ApiOperation(value = "支付宝签约", notes = "前端先调用此接口，由服务端请求支付宝组装scheme地址，之后前端通过该地址唤起支付宝进行签约")
     @PostMapping("/signUp")
     public R signUp(@RequestBody AliPaySignUpDto signUpDto) {
-        String price = "19.9";
+        BigDecimal orderPrice = PriceUtil.getOrderPrice();
+        String price = orderPrice.toString();
+
         //查询用户31天内是否已经有代扣成功的记录了
         if (!aliPayOrderService.checkOpen(signUpDto.getMobile())) {
             return R.error(ResultCodeEnum.user_month_repeat_open);
@@ -332,7 +338,8 @@ public class AliPayController {
                     AliPayInOrderByAgreementReq payInOrderByAgreementReq = new AliPayInOrderByAgreementReq();
                     payInOrderByAgreementReq.setAuthCode(agreementNo);
                     payInOrderByAgreementReq.setSubject("惠点联合会员");
-                    String price = "19.9";
+                    BigDecimal orderPrice = PriceUtil.getOrderPrice();
+                    String price = orderPrice.toString();
                     payInOrderByAgreementReq.setTotalAmount(price);
                     String outTradeNo = OrderUtil.getOutTradeNo();
                     //保存支付的订单号
@@ -534,4 +541,15 @@ public class AliPayController {
 //            }
 //        }
 //    }
+
+    public static void main(String[] args) {
+        BigDecimal bigDecimal = new BigDecimal("19.9");
+        for (int i = 0; i < 15; i++) {
+            int random = (ThreadLocalRandom.current().nextInt(10));
+            BigDecimal randomBigDecimal = BigDecimal.valueOf(random);
+            BigDecimal subtract = bigDecimal.subtract(randomBigDecimal.divide(new BigDecimal(100),2, RoundingMode.HALF_UP));
+            System.out.println(subtract);
+
+        }
+    }
 }