From e46e5c0a5989f2839bcfe920b52c74bfdf3d7089 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Wed, 9 Feb 2022 17:19:00 +0800
Subject: [PATCH] adding PaymentToken

---
 .../module/system/wxpay/WxpayService.java     | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
index bb11c540..78fd7891 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
@@ -9,6 +9,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService
 import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.notify.model.NotifyEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyService;
+import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderCouponEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPay;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil;
 import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
@@ -90,7 +93,6 @@ public class WxpayService {
             SortedMap<String, String> sortedMap = WXPayUtil.getSortedMap(callBackMap);
             // 校验签名是否正确
             if (!WXPayUtil.isCorrectSign(sortedMap, config.getKey())) {
-                System.out.println("签名校验成功！");
                 // 更新订单状态
                 if ("SUCCESS".equals(sortedMap.get("result_code"))) {
                     String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
@@ -118,7 +120,42 @@ public class WxpayService {
                     memberAccountChangeEntity.setMemberId(orderEntity.getMemberId());
                     memberAccountService.memberAccountChange(memberAccountChangeEntity);
 
-
+                    //更新订单信息
+                    QueryEntity queryEntity = new QueryEntity();
+                    queryEntity.setOrderNumber(outTradeNo);
+                    String orderEntityJson = orderService.query(queryEntity);
+                    com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderEntityJson);
+                    JSONObject jsonObject = (JSONObject)jsonArray.get(0);
+                    if(orderEntity != null) {
+                        AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity();
+                        addOrSaveEntity.setOrderNumber(outTradeNo);
+                        addOrSaveEntity.setPhoneNumber(orderEntity.getPhoneNumber());
+                        addOrSaveEntity.setStatus("1");
+                        addOrSaveEntity.setOrderDetailList(jsonObject.getString("orderDetailList"));
+                        addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType"));
+                        addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount"));
+                        addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate"));
+                        addOrSaveEntity.setAddressCityName(jsonObject.getString("addressCityName"));
+                        addOrSaveEntity.setAddressCountyName(jsonObject.getString("addressCountyName"));
+                        addOrSaveEntity.setAddressDetailInfo(jsonObject.getString("addressDetailInfo"));
+                        addOrSaveEntity.setAddressPhoneNumber(jsonObject.getString("addressPhoneNumber"));
+                        addOrSaveEntity.setAddressProvinceName(jsonObject.getString("addressProvinceName"));
+                        addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName"));
+                        addOrSaveEntity.setPaymentAmount(totalFee);
+                        addOrSaveEntity.setPaymentToken(sortedMap.get("transaction_id"));
+                        if (orderEntity.getCouponCode() != "" && null != orderEntity.getCouponCode()) {
+                            //coupon json化
+                            OrderCouponEntity orderCouponEntity = new OrderCouponEntity();
+                            orderCouponEntity.setCouponCode(orderEntity.getCouponCode());
+                            orderCouponEntity.setCouponName(orderEntity.getCouponName());
+                            orderCouponEntity.setCouponId(orderEntity.getCouponId());
+                            Map<String, String> orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity);
+                            MapRemoveNullUtil.removeNullEntry(orderCouponParamMap);
+                            net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap);
+                            addOrSaveEntity.setOrderCoupon(orderCouponJson.toString());
+                        }
+                        orderService.addOrSave(addOrSaveEntity);
+                    }
                     NotifyEntity notifyEntity = new NotifyEntity();
                     notifyEntity.setAppId(sortedMap.get("appid"));
                     notifyEntity.setMchId(sortedMap.get("mch_id"));