From 9d81665b02302af337c884d9a0139bf6f95794f1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 19 Jun 2025 18:56:05 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/apiweb/CommonController.java  | 11 -----------
 .../xdadan/erp/apiweb/SettleBillController.java  | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
index b03f19f..ab964e1 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
@@ -118,7 +118,6 @@ public class CommonController extends BaseController
 
      * @return
      */
-
     @RequestMapping(value = "/getLastAppVersion")
     public AjaxResult getLastAppVersion()
     {
@@ -134,8 +133,6 @@ public class CommonController extends BaseController
         }
     }
 
-
-
     /**
      * 获取电子面单单号
      */
@@ -158,9 +155,6 @@ public class CommonController extends BaseController
         }
     }
 
-
-
-
     /**
      * 获取解析地址
      */
@@ -206,8 +200,6 @@ public class CommonController extends BaseController
         }
     }
 
-
-
     /**
      * 预览电子面单打印
      */
@@ -255,7 +247,6 @@ public class CommonController extends BaseController
 
             }
 
-
             return AjaxResult.success("获取成功",tplList);
         }catch (Exception ex){
             ex.printStackTrace();
@@ -286,7 +277,6 @@ public class CommonController extends BaseController
             return AjaxResult.error("appId error!");
         }
 
-
         List<Map> rstList = new ArrayList();
         Map<String,Object> rstMap = new HashMap<>();
         rstMap.put("billCode",mainNo);
@@ -317,7 +307,6 @@ public class CommonController extends BaseController
             return AjaxResult.error("appId error!");
         }
 
-
         List<Map> rstList = new ArrayList();
         Map<String,Object> rstMap = new HashMap<>();
         rstMap.put("billCode",mainNo);
diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
index 5576ccb..f4e6050 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
@@ -116,6 +116,7 @@ public class SettleBillController extends BaseController
         return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
     }
 
+
     /**
      * 获取结算总账单详细信息
      */
@@ -134,12 +135,10 @@ public class SettleBillController extends BaseController
         return AjaxResult.success("成功",emisSettleBill);
     }
 
-
     @GetMapping(value = "/getWxPayQrCode")
     public AjaxResult getWxPayQrCode(EmisSettleBill emisSettleBill)
     {
         try {
-//            String customerCode=emisSettleBill.getCustomerCode();
             String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo());
             return AjaxResult.success("成功",qrPicUrl);
         } catch (EmisBizError emisBizError) {
@@ -152,9 +151,16 @@ public class SettleBillController extends BaseController
     @PostMapping(value = "/sumbitWxPay")
     public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill)
     {
-        String customerCode=emisSettleBill.getCustomerCode();
-        emisSettleBill.setCustomerCode(customerCode);
-        return AjaxResult.success("123");
+//        String customerCode=emisSettleBill.getCustomerCode();
+//        emisSettleBill.setCustomerCode(customerCode);
+        try {
+            String prepayId=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId());
+            return AjaxResult.success("成功",prepayId);
+        } catch (EmisBizError emisBizError) {
+            emisBizError.printStackTrace();
+            return AjaxResult.error(emisBizError.getMessage());
+        }
+
     }