nnnn

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Goods.java

@@ -1,6 +1,7 @@
 package com.ruoyi.cai.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -40,8 +41,12 @@ public class Goods implements Serializable {
     /**
      *
      */
-    @Schema(description = "紫贝数量")
+    @Schema(description = "支付宝紫贝数量")
     private Long amount;
+    @Schema(description = "微信紫贝数量")
+    private Long wxAmount;
+    @TableField(exist = false)
+    private Long aliAmountDiff;
     /**
      * 状态 0 可用  1不可用
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java

@@ -12,6 +12,7 @@ import com.ijpay.core.enums.SignType;
 import com.ijpay.core.kit.WxPayKit;
 import com.ijpay.wxpay.WxPayApi;
 import com.ijpay.wxpay.model.OrderQueryModel;
+import com.ruoyi.cai.domain.Goods;
 import com.ruoyi.cai.domain.PayConfig;
 import com.ruoyi.cai.domain.RechargeOrder;
 import com.ruoyi.cai.domain.VipOrder;
@@ -21,10 +22,7 @@ import com.ruoyi.cai.dto.commom.consumer.RechargeConsumerResp;
 import com.ruoyi.cai.manager.AwardManager;
 import com.ruoyi.cai.manager.ConsumerManager;
 import com.ruoyi.cai.pay.model.PayQueryModel;
-import com.ruoyi.cai.service.PayConfigService;
-import com.ruoyi.cai.service.PayTotalService;
-import com.ruoyi.cai.service.RechargeOrderService;
-import com.ruoyi.cai.service.VipOrderService;
+import com.ruoyi.cai.service.*;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +49,8 @@ public class PayManager {
     private PayConfigService payConfigService;
     @Autowired
     private PayConfigManager payConfigManager;
+    @Autowired
+    private GoodsService goodsService;
 
     public PayQueryModel queryOrder(PayConfig payConfig,String orderNo,String appid) throws AlipayApiException {
         if(PayTypeEnum.ALI.getCode().equals(payConfig.getPayType())){
@@ -161,7 +161,7 @@ public class PayManager {
         }
     }
 
-    public PayOrderInfoDTO getOrderInfo(String orderNo){
+    public PayOrderInfoDTO getOrderInfo(String orderNo,boolean wx){
         OrderTypeEnum orderTypeEnum = OrderNoUtil.getType(orderNo);
         if(orderTypeEnum == null){
             log.error("订单类型有误！orderNo={}",orderNo);
@@ -194,6 +194,16 @@ public class PayManager {
                 if(!PayStatusEnum.READY_PAY.getCode().equals(rechargeOrder.getPayStatus())){
                     throw new ServiceException("订单状态有误，请重新下单支付");
                 }
+                if(wx){
+                    if(rechargeOrder.getRechargeId() != null){
+                        Goods goods = goodsService.getById(rechargeOrder.getRechargeId());
+                        if(goods != null){
+                            rechargeOrderService.update(Wrappers.lambdaUpdate(RechargeOrder.class)
+                                    .eq(RechargeOrder::getId, rechargeOrder.getId())
+                                    .set(RechargeOrder::getRechargeCoin, goods.getWxAmount()));
+                        }
+                    }
+                }
                 dto = new PayOrderInfoDTO();
                 dto.setBody(rechargeOrder.getRechargeName());
                 dto.setSubject(rechargeOrder.getRechargeName());