From 9154555e3bee0767b4aff7a8eaa36456b7b5dea7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 29 五月 2023 18:27:30 +0800
Subject: [PATCH] 完成小微商户商户注册接口对接调试

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 39c2621..731626c 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -101,6 +101,9 @@
     @Autowired
     private PushUtil pushUtil;
 
+    @Value("${callbackPath}")
+    private String callbackPath;
+
 
 
     /**
@@ -482,7 +485,7 @@
     @Override
     public PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception {
         PromotionWarpper promotionWarpper = new PromotionWarpper();
-        promotionWarpper.setUrl("http://121.37.15.157/share/driverShare/index.html?inviterId=" + uid);
+        promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
         int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
         int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
         promotionWarpper.setTotal(user + driver);
@@ -871,7 +874,7 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil microenterprise(Integer uid, String name, String number, String phone) throws Exception {
+    public ResultUtil microenterprise(Integer uid, String name, String number, String phone, String notifyUrl) throws Exception {
         Driver driver = this.selectById(uid);
         Register registerVO = new Register();
         registerVO.setMerUserId("driver_" + uid);
@@ -879,10 +882,10 @@
         registerVO.setUserType("0");
         registerVO.setUserName(name);
         registerVO.setCertId(number);
-        registerVO.setNotifyUrl("");
+        registerVO.setNotifyUrl(callbackPath + notifyUrl);
         TrhRequest<Register> request = new TrhRequest();
         InterfaceResponse execute = request.execute(registerVO, Register.SERVICE_CODE);
-        if(!"0000".equals(execute.getResult())){
+        if(!"0000".equals(execute.getCode())){
             return ResultUtil.error(execute.getMsg());
         }
         JSONObject jsonObject = JSON.parseObject(execute.getResult());

--
Gitblit v1.7.1