Merge remote-tracking branch 'origin/master' into master

jd-logistics-auth/src/main/java/com/ruoyi/auth/controller/WxMiniController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 微信小程序登录
  */
 @RestController
-@RequestMapping("/front/wxmini")
+@RequestMapping("/wxmini")
 public class WxMiniController {
 
     @Autowired

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WxMiniController.java

@@ -29,9 +29,9 @@ public class WxMiniController {
 
     @InnerAuth
     @GetMapping("/getOpenId")
-    public String getOpenId(@RequestParam("jsCode") String jsCode) {
+    public R<String> getOpenId(@RequestParam("jsCode") String jsCode) {
         try {
-            return wxService.getOpenId(jsCode);
+            return R.ok(wxService.getOpenId(jsCode));
         } catch (WxErrorException e) {
             throw new RuntimeException(e);
         }
@@ -39,9 +39,9 @@ public class WxMiniController {
 
     @InnerAuth
     @GetMapping("/getPhoneNumber")
-    public String getPhoneNumber(@RequestParam("code") String code) {
+    public R<String>  getPhoneNumber(@RequestParam("code") String code) {
         try {
-            return wxService.getPhoneNumber(code);
+            return R.ok(wxService.getPhoneNumber(code));
         } catch (WxErrorException e) {
             throw new RuntimeException(e);
         }
@@ -50,14 +50,18 @@ public class WxMiniController {
     @InnerAuth
     @PostMapping("/getUserByOpenId")
     public R<LoginUser> getUserByOpenId(@RequestBody SysUser sysUser) {
-        SysUser currentUser = sysUserService.selectUserByUserName(sysUser.getUserName());
-        if (StringUtils.isNull(sysUser))
+        SysUser currentUser = sysUserService.selectUserByOpenId(sysUser);
+        if (StringUtils.isNull(currentUser))
         {
-            return R.fail("用户名或密码错误");
+            currentUser = sysUserService.selectUserByOpenId(sysUser);
+            if (StringUtils.isNull(currentUser))
+            {
+                return R.fail("用户不存在");
+            }
+            currentUser.setOpenId(sysUser.getOpenId());
         }
-        sysUser.setOpenId(sysUser.getOpenId());
         // 更新用户openid
-        sysUserService.updateUser(sysUser);
+        sysUserService.updateUser(currentUser);
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(currentUser);
         // 权限集合

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillCostDetailsController.java

@@ -41,7 +41,6 @@ public class BizWaybillCostDetailsController extends BaseController
      * 参数：  月份--月度账单中的月份 格式2026.01
      *        供应商--也叫部门id
      */
-    @RequiresPermissions("system:costDetails:list")
     @GetMapping("/list")
     public TableDataInfo list(BizWaybillCostDetails bizWaybillCostDetails)
     {