fix

2024-06-07 17:42:01 +08:00
parent f75c326d10
commit 8608663861
5 changed files with 52 additions and 47 deletions
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java
@@ -9,7 +9,6 @@ import org.springframework.format.annotation.DateTimeFormat;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;

 /**
 * 余额明细对象 play_balance_details_info
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/service/impl/PlayBalanceDetailsInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/service/impl/PlayBalanceDetailsInfoServiceImpl.java
@@ -21,7 +21,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Arrays;
-import java.util.Date;

 /**
 * 余额明细Service业务层处理
--- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java
@@ -17,7 +17,6 @@ import com.starry.admin.modules.custom.module.vo.PlayCustomRankingQueryVo;
 import com.starry.admin.modules.custom.module.vo.PlayCustomRankingReturnVo;
 import com.starry.admin.modules.custom.module.vo.PlayCustomUserQueryVo;
 import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
-import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
 import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.impl.PlayOrderInfoServiceImpl;
@@ -72,7 +71,7 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl<PlayCustomUserInf
            return rechargeAmount;
        }
        try {
-            BigDecimal paymentAmount = BigDecimal.valueOf(entity.getDiscount()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP).add(rechargeAmount);
+            BigDecimal paymentAmount = BigDecimal.valueOf(entity.getDiscount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(rechargeAmount);
            log.info("等级为{}的顾客{},充值{}元，实际应该支付{}元", entity.getName(), customId, rechargeAmount, paymentAmount);
            return paymentAmount;
        } catch (Exception e) {
--- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
@@ -279,9 +279,10 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
     */

    @Override
-    public void createRechargeOrder(String orderOn, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy) {
+    public void createRechargeOrder(String orderId, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy) {
        PlayOrderInfoEntity entity = new PlayOrderInfoEntity(IdUtils.getUuid(), ORDER_STATUS_3, "0", "-1");
-        entity.setOrderNo(orderOn);
+        entity.setOrderNo(this.getOrderNo());
+        entity.setId(orderId);
        entity.setOrderMoney(orderMoney);
        entity.setFinalAmount(finalAmount);
        entity.setPurchaserBy(purchaserBy);
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
@@ -1,14 +1,9 @@
 package com.starry.admin.modules.weichat.controller;


+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.util.SignUtils;
 import com.starry.admin.common.aspect.CustomUserLogin;
 import com.starry.admin.common.conf.ThreadLocalRequestDetail;
 import com.starry.admin.common.exception.CustomException;
@@ -126,6 +121,15 @@ public class WxPlayController {
    //}


+    @CustomUserLogin
+    @GetMapping("/custom/getCustomPaymentAmount")
+    public R getCustomPaymentAmount(@RequestParam("money") String money) {
+        if (StringUtils.isEmpty(money)) {
+            throw new CustomException("请求参数错误,money不能为空");
+        }
+        BigDecimal paymentAmount = customUserInfoService.getCustomPaymentAmount(new BigDecimal(money), ThreadLocalRequestDetail.getCustomUserInfo().getId());
+        return R.ok(paymentAmount);
+    }
    @CustomUserLogin
    @GetMapping("/custom/createOrder")
    public R createOrder(@RequestParam("money") String money) {
@@ -143,42 +147,45 @@ public class WxPlayController {
        // 订单总金额，单位为分
        long totalFee = getTotalFee(money);
        // 创建订单信息
-        String orderNo = playOrderInfoService.getOrderNo();
-        orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId());
+//        String orderNo = playOrderInfoService.getOrderNo();
+        String orderId = IdUtil.fastSimpleUUID();
+        orderInfoService.createRechargeOrder(orderId, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId());
+        customUserInfoService.customAccountBalanceRecharge(new BigDecimal(money), ThreadLocalRequestDetail.getCustomUserInfo().getId(), orderId);
+        return R.ok("充值成功");

-        WxPayService wxPayService = mpService.getWxPay();
-        WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
-        request.setOpenid(customUserInfo.getOpenid());
-        // 订单总金额，单位为分（开发阶段固定设置为支付1分钱）
-        request.setTotalFee(1);
-        request.setOutTradeNo(orderNo);
-        request.setTradeType("JSAPI");
-        request.setSpbillCreateIp("101.43.206.16");
-        request.setNotifyUrl(wxPayService.getConfig().getNotifyUrl());
-        request.setBody("船票充值");
-        WxPayUnifiedOrderResult orderResult;
-        try {
-            orderResult = wxPayService.unifiedOrder(request);
-        } catch (WxPayException e) {
-            throw new RuntimeException(e);
-        }
-
-        String prepayId = orderResult.getPrepayId();
-        //组合参数构建支付
-        Map<String, String> paySignInfo = new HashMap<>(5);
-        String timeStamp = String.valueOf(System.currentTimeMillis());
-        String nonceStr = "dalfhh241lnandnsklajax";
-        paySignInfo.put("appId", wxPayService.getConfig().getAppId());
-        paySignInfo.put("nonceStr", nonceStr);
-        paySignInfo.put("timeStamp", timeStamp);
-        paySignInfo.put("signType", "MD5");
-        paySignInfo.put("package", "prepay_id=" + prepayId);
-        String[] signInfo = new String[0];
-        String paySign = SignUtils.createSign(paySignInfo, "MD5", wxPayService.getConfig().getMchKey(), signInfo);
-
-        //组合支付参数
-        JSONObject jsonObject = new JSONObject().fluentPut("appId", wxPayService.getConfig().getAppId()).fluentPut("timeStamp", timeStamp).fluentPut("nonceStr", nonceStr).fluentPut("package", "prepay_id=" + prepayId).fluentPut("signType", "MD5").fluentPut("paySign", paySign);
-        return R.ok(jsonObject);
+//        WxPayService wxPayService = mpService.getWxPay();
+//        WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
+//        request.setOpenid(customUserInfo.getOpenid());
+//        // 订单总金额，单位为分（开发阶段固定设置为支付1分钱）
+//        request.setTotalFee(1);
+//        request.setOutTradeNo(orderNo);
+//        request.setTradeType("JSAPI");
+//        request.setSpbillCreateIp("101.43.206.16");
+//        request.setNotifyUrl(wxPayService.getConfig().getNotifyUrl());
+//        request.setBody("船票充值");
+//        WxPayUnifiedOrderResult orderResult;
+//        try {
+//            orderResult = wxPayService.unifiedOrder(request);
+//        } catch (WxPayException e) {
+//            throw new RuntimeException(e);
+//        }
+//
+//        String prepayId = orderResult.getPrepayId();
+//        //组合参数构建支付
+//        Map<String, String> paySignInfo = new HashMap<>(5);
+//        String timeStamp = String.valueOf(System.currentTimeMillis());
+//        String nonceStr = "dalfhh241lnandnsklajax";
+//        paySignInfo.put("appId", wxPayService.getConfig().getAppId());
+//        paySignInfo.put("nonceStr", nonceStr);
+//        paySignInfo.put("timeStamp", timeStamp);
+//        paySignInfo.put("signType", "MD5");
+//        paySignInfo.put("package", "prepay_id=" + prepayId);
+//        String[] signInfo = new String[0];
+//        String paySign = SignUtils.createSign(paySignInfo, "MD5", wxPayService.getConfig().getMchKey(), signInfo);
+//
+//        //组合支付参数
+//        JSONObject jsonObject = new JSONObject().fluentPut("appId", wxPayService.getConfig().getAppId()).fluentPut("timeStamp", timeStamp).fluentPut("nonceStr", nonceStr).fluentPut("package", "prepay_id=" + prepayId).fluentPut("signType", "MD5").fluentPut("paySign", paySign);
+//        return R.ok(jsonObject);
    }