微信支付--小程序下单

微信支付--账单实体类

PaymentClient/src/main/java/com/zhongshu/payment/client/model/param/WxTransactionsParam.java

@@ -3,7 +3,9 @@ package com.zhongshu.payment.client.model.param;
 import com.wechat.pay.java.service.refund.model.Amount;
 import com.zhongshu.payment.client.types.WxPayType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
@@ -13,6 +15,8 @@ import java.util.Map;
  * @date 2024/7/23
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxTransactionsParam {
 
 //    // 公众号ID(必填)
@@ -25,7 +29,7 @@ public class WxTransactionsParam {
     private String oid;
 
     @Schema(name = "微信授权code",required = true, example = "21321")
-    private String jsCode;
+    private String jscode;
 
     // 商品描述(必填)
     @Schema(name = "商品描述",required = true, example = "充值服务")
@@ -58,7 +62,5 @@ public class WxTransactionsParam {
     //下单类型
     private WxPayType wxPayType;
 
-    //获取openid
-    private String jscode;
 
 }

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/PrepayOrderDao.java

@@ -1,12 +0,0 @@
-package com.zhongshu.payment.server.core.dao;
-
-import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.payment.server.core.dao.extend.PrepayOrderDaoExtend;
-import com.zhongshu.payment.server.core.domain.wechatPay.PrepayOrder;
-
-/**
- * @author wjf
- * @date 2024/7/24
- */
-public interface PrepayOrderDao extends MongoDao<PrepayOrder>, PrepayOrderDaoExtend {
-}

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/TradebillDao.java

@@ -0,0 +1,12 @@
+package com.zhongshu.payment.server.core.dao;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.payment.server.core.dao.extend.TradebillDaoExtend;
+import com.zhongshu.payment.server.core.domain.tradebill.Tradebill;
+
+/**
+ * @author wjf
+ * @date 2024/7/24
+ */
+public interface TradebillDao extends MongoDao<Tradebill>, TradebillDaoExtend {
+}

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/extend/PrepayOrderDaoExtend.java → PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/extend/TradebillDaoExtend.java

@@ -4,5 +4,5 @@ package com.zhongshu.payment.server.core.dao.extend;
  * @author wjf
  * @date 2024/7/24
  */
-public interface PrepayOrderDaoExtend {
+public interface TradebillDaoExtend {
 }

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/impl/PrepayOrderDaoImpl.java

@@ -1,10 +0,0 @@
-package com.zhongshu.payment.server.core.dao.impl;
-
-import com.zhongshu.payment.server.core.dao.extend.PrepayOrderDaoExtend;
-
-/**
- * @author wjf
- * @date 2024/7/24
- */
-public class PrepayOrderDaoImpl implements PrepayOrderDaoExtend {
-}

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/impl/TradebillDaoImpl.java

@@ -0,0 +1,10 @@
+package com.zhongshu.payment.server.core.dao.impl;
+
+import com.zhongshu.payment.server.core.dao.extend.TradebillDaoExtend;
+
+/**
+ * @author wjf
+ * @date 2024/7/24
+ */
+public class TradebillDaoImpl implements TradebillDaoExtend {
+}

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wxPaymentV3/WxPaymentService.java

@@ -29,7 +29,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jline.internal.Log;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -128,7 +127,16 @@ public class WxPaymentService extends SuperService {
             request.setPayer(payer);
             PrepayResponse response = service.prepay(request);
 
-            PrePayModel prePayModel = buildPrepayResultModel(response);
+            PrePayModel prePayModel = new PrePayModel();
+            prePayModel.setNonceStr(NonceUtil.createNonce(10));
+            prePayModel.setPackAge("prepay_id=" + response.getPrepayId());
+            prePayModel.setSignType("RSA");
+            long timeStamp = System.currentTimeMillis() / 1000;
+            prePayModel.setTimeStamp(Long.toString(timeStamp));
+
+            String sign = buildMessage(WxV3PayConfig.APP_ID, timeStamp, prePayModel.getNonceStr(), prePayModel.getPackAge());
+            String signature = sign(WxV3PayConfig.privateKeyPath, sign.getBytes("utf-8"));
+            prePayModel.setPaySign(signature);
             return ResultContent.buildContent(prePayModel);
         } catch (HttpException e) { // 发送HTTP请求失败
             // 调用e.getHttpRequest()获取请求打印日志或上报监控，更多方法见HttpException定义
@@ -148,21 +156,6 @@ public class WxPaymentService extends SuperService {
         }
     }
 
-    @NotNull
-    private PrePayModel buildPrepayResultModel(PrepayResponse response) throws UnsupportedEncodingException {
-        PrePayModel prePayModel = new PrePayModel();
-        prePayModel.setNonceStr(NonceUtil.createNonce(10));
-        prePayModel.setPackAge("prepay_id=" + response.getPrepayId());
-        prePayModel.setSignType("RSA");
-        long timeStamp = System.currentTimeMillis() / 1000;
-        prePayModel.setTimeStamp(Long.toString(timeStamp));
-
-        String sign = buildMessage(WxV3PayConfig.APP_ID, timeStamp, prePayModel.getNonceStr(), prePayModel.getPackAge());
-        String signature = sign(WxV3PayConfig.privateKeyPath, sign.getBytes("utf-8"));
-        prePayModel.setPaySign(signature);
-        return prePayModel;
-    }
-
     @SneakyThrows
     public String sign(String privateKeyPath, byte[] message){
         Signature sign = Signature.getInstance("SHA256withRSA");