point bug

src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java

@@ -18,5 +18,7 @@ public interface PayWechatOrderService extends IService<PayWechatOrderEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     void add(String orderSn,String prepayId);
+
+    void addForPoint(String orderSn,String prepayId,Integer buyOrderId);
 }
 

src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java

@@ -50,4 +50,22 @@ public class PayWechatOrderServiceImpl extends ServiceImpl<PayWechatOrderDao, Pa
         this.save(entity);
     }
 
+    @Override
+    public void addForPoint(String orderSn, String prepayId, Integer buyOrderId) {
+        QueryWrapper<BuyOrderEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_sn", orderSn);
+        BuyOrderEntity buyOrder = buyOrderService.getOne(wrapper);
+        PayWechatOrderEntity entity = new PayWechatOrderEntity();
+        entity.setCustomerId(buyOrder.getUserId());
+        entity.setCreateTime(new Date());
+        entity.setOrderSn(buyOrder.getOrderSn());
+        entity.setPrepayId(prepayId);
+        entity.setTotalAmount(buyOrder.getRealMoney());
+        entity.setSystemLog("预支付完成");
+        entity.setPayType(buyOrder.getOrderType());
+        entity.setOrderId(buyOrder.getOrderSn());
+        entity.setBuyOrderId(buyOrderId);
+        this.save(entity);
+
+    }
 }

src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java

@@ -58,6 +58,11 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         log.info("请求参数:{}", paramMap);
         JSONObject responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getPayUrl(), json.toJSONString());
         String prepayId = responseJson.getString("prepay_id");
-        payWechatOrderService.add(paymentInfo.getOrderSn(), prepayId);
+        if(paymentInfo.getBuyOrderId()==null){
+            payWechatOrderService.add(paymentInfo.getOrderSn(), prepayId);
+        }else {
+            payWechatOrderService.addForPoint(paymentInfo.getOrderSn(), prepayId,paymentInfo.getBuyOrderId());
+        }
+
     }
 }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
     database: 0
-    host: 59.110.212.44
+    host: 39.106.36.183
     port: 6379
     password: Jgll2015   # 密码（默认为空）
     timeout: 6000000ms  # 连接超时时长（毫秒）
@@ -72,5 +72,5 @@ aliyun:
 server:
   port: 9200
 
-redisAddress: redis://59.110.212.44:6379
+redisAddress: redis://39.106.36.183:6379
 redisPassword: Jgll2015

src/test/java/com/VxApiTest.java

@@ -1,11 +1,12 @@
 package com;
 
 import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
+import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.security.PrivateKey;
 @SpringBootTest
 public class VxApiTest {
@@ -32,5 +33,13 @@ public class VxApiTest {
         System.out.println(mchId);
     }
 
+    @Test
+    public void mytest(){
+        WechatPaymentInfo wechatPaymentInfo = new WechatPaymentInfo();
+        wechatPaymentInfo.setTotalAmount(new BigDecimal(56));
+        wechatPaymentInfo.setOrderSn("testtest");
+        System.out.println(wechatPaymentInfo.toString());
+    }
+
 
 }