添加耗材

src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java

@@ -29,6 +29,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @CrossOrigin(origins = "*")
 @RestController
@@ -60,32 +61,18 @@ public class LoginContoller {
     RedisUtil redisUtil;
 
 
-//    @RequestMapping("/wx/business/login")
+    @RequestMapping("/wx/business/login")
     public Result wxBusinessLogin(@RequestParam(value = "code", required = false) String code,
-                                  @RequestParam(value = "rawData", required = false) String rawData,
-                                  @RequestParam(value = "signature", required = false) String signature
+                                  @RequestParam(value = "shopId", required = false) String shopId
     ) {
 
-
-        // 用户非敏感信息：rawData
-        // 签名：signature
-        JSONObject rawDataJson = JSON.parseObject(rawData);
-        // 1.接收小程序发送的code
-        // 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
         JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, businessAppId, businessSecrete);
-        // 3.接收微信接口服务 获取返回的参数
         String openid = SessionKeyOpenId.getString("openid");
-        String sessionKey = SessionKeyOpenId.getString("session_key");
-
-        // 4.校验签名 小程序发送的签名signature与服务器端生成的签名signature2 = sha1(rawData + sessionKey)
-        String signature2 = DigestUtils.sha1Hex(rawData + sessionKey);
-        if (!signature.equals(signature2)) {
-            return Result.fail("签名校验失败");
+        if(Objects.isNull(openid)){
+            return Result.fail("获取微信id失败");
         }
 
-
-        return Result.success(CodeEnum.ENCRYPT);
-
+        return loginService.wxBusinessLogin(openid,shopId);
     }
 
     /**

src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java

@@ -148,4 +148,10 @@ public class UserContoller {
 //        String userSign = jsonObject.getString("userSign");
         return userService.userAll(integralFlowVo,"userSign");
     }
+
+
+
+
+
+
 }