From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 service-user/src/main/java/com/java110/user/api/StaffApi.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/StaffApi.java b/service-user/src/main/java/com/java110/user/api/StaffApi.java
old mode 100644
new mode 100755
index fc99215..f0e3c8a
--- a/service-user/src/main/java/com/java110/user/api/StaffApi.java
+++ b/service-user/src/main/java/com/java110/user/api/StaffApi.java
@@ -1,6 +1,7 @@
 package com.java110.user.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.app.AppDto;
 import com.java110.dto.staffAppAuth.StaffAppAuthDto;
 import com.java110.po.staffAppAuth.StaffAppAuthPo;
 import com.java110.user.bmo.staffAppAuth.IDeleteStaffAppAuthBMO;
@@ -13,12 +14,7 @@
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
@@ -57,18 +53,20 @@
     /**
      * 寰俊淇敼娑堟伅妯℃澘
      *
-     * @param reqJson
+     * @param param
      * @return
      * @serviceCode /staff/updateStaffAppAuth
      * @path /app/staff/updateStaffAppAuth
+     * <p>
+     * {"openId":"oxeFbwJzDG8t87dVDcmrlRoPsTfM","appType":"WECHAT","state":"2002","storeId":"402019032924930007","staffId":"30518940136629616640"}
      */
     @RequestMapping(value = "/updateStaffAppAuth", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStaffAppAuth(@RequestBody JSONObject reqJson) {
-
+    public ResponseEntity<String> updateStaffAppAuth(@RequestBody String param) {
+        JSONObject reqJson = JSONObject.parseObject(param);
         Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
         Assert.hasKeyAndValue(reqJson, "appType", "璇锋眰鎶ユ枃涓湭鍖呭惈appType");
-        Assert.hasKeyAndValue(reqJson, "auId", "auId涓嶈兘涓虹┖");
-
+        Assert.hasKeyAndValue(reqJson, "openId", "璇锋眰鎶ユ枃涓湭鍖呭惈openId");
+        Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
 
         StaffAppAuthPo staffAppAuthPo = BeanConvertUtil.covertBean(reqJson, StaffAppAuthPo.class);
         return updateStaffAppAuthBMOImpl.update(staffAppAuthPo);
@@ -126,9 +124,10 @@
     public ResponseEntity<String> generatorQrCode(@RequestHeader(value = "store-id") String storeId,
                                                   @RequestHeader(value = "user-id") String userId,
                                                   @RequestParam(value = "communityId") String communityId) {
+
         String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL")
                 + "/app/staffAuth?storeId=" + storeId + "&staffId=" + userId
-                + "&communityId=" + communityId;
+                + "&communityId=" + communityId + "&appId=" + AppDto.WECHAT_OWNER_APP_ID;
         return ResultVo.createResponseEntity(ownerUrl);
     }
 }

--
Gitblit v1.8.0