From 5eb1a3021445e586759ccbf62fd41c31cacdeaff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 29 Sep 2022 15:59:56 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index e288e53..3797798 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -236,10 +236,31 @@
         String rcResult = "";
         switch (payOrderDto.getType()) {
             case "1":
+                UnipayDto unipayDtoWx = new UnipayDto();
+//                unipayDto.setAmount(new BigDecimal("0.01"));
+                unipayDtoWx.setAmount(orderInfo.getAmount());
+                unipayDtoWx.setFrpCode("WEIXIN_APP3");
+                unipayDtoWx.setTradeMerchantNo("777180800385820");
+                unipayDtoWx.setOrderNo(orderInfo.getOrderNo());
+                List<MallOrderItem> itemsWx = orderInfo.getItems();
+                if(CollUtil.isEmpty(itemsWx)){
+                    unipayDtoWx.setProductName("商品");
+                }else{
+                    unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
+                }
+                String unipayStrWx = unipayService.unipay(unipayDtoWx);
+                if("fail" == unipayStrWx){
+                    throw new FebsException("支付失败");
+                }else{
+//                    JSONUtil.parseObj(unipayStr);
+                    JSONObject jsonObject = JSONUtil.parseObj(unipayStrWx);
+                    payResultStr = (String) jsonObject.get("r7_TrxNo");
+                    rcResult = (String) jsonObject.get("rc_Result");
+                }
+                orderInfo.setPayOrderNo(payResultStr);
 //                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
 //                orderInfo.setPayImage(payOrderDto.getPayImage());
                 orderInfo.setPayMethod("微信支付");
-                agentProducer.sendOrderReturn(orderInfo.getId());
                 break;
             case "2":
 //                if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {

--
Gitblit v1.9.1