From 75e04de658b8a2c3384ee23048c0f2398f240102 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 27 Aug 2025 23:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=96=B0=E5=A2=9E=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AdminBaseMenuServiceImpl.java        | 34 +++++++++----------
 .../mall/common/utils/ContextUtil.java        |  2 +-
 .../service/impl/LakalaPayServiceImpl.java    |  7 ++--
 .../impl/ShopOrderBaseServiceImpl.java        |  3 +-
 .../impl/ShopStoreBaseServiceImpl.java        |  5 +--
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java
index 51eb1e44..70e702e0 100644
--- a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java
+++ b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java
@@ -78,7 +78,6 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
     @Override
     public List<Router> getRouterList() {
         UserDto user = getCurrentUser();
-//        log.debug("##### 当前登录用户：{}###", JsonUtil.object2json(user));
 
         if (ObjectUtil.isEmpty(user)) {
             throw new ApiException(ResultCode.UNAUTHORIZED);
@@ -839,16 +838,16 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
     public CommonResult getAdminBaseMenuPage(Integer pageNo, Integer pageSize) {
         try {
             checkouRole();
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             return CommonResult.failed(e.getMessage());
         }
-        AdminBaseMenu adminBaseMenu=new AdminBaseMenu();
-        QueryWrapper<AdminBaseMenu> queryWrapper=new QueryWrapper(adminBaseMenu);
-        String menu_name= getParameter("menu_name");
-        if(StringUtils.isNotEmpty(menu_name)){
+        AdminBaseMenu adminBaseMenu = new AdminBaseMenu();
+        QueryWrapper<AdminBaseMenu> queryWrapper = new QueryWrapper(adminBaseMenu);
+        String menu_name = getParameter("menu_name");
+        if (StringUtils.isNotEmpty(menu_name)) {
             queryWrapper.like("menu_name", menu_name);
         }
-        Page<AdminBaseMenu> data= lists(queryWrapper,pageNo,pageSize);
+        Page<AdminBaseMenu> data = lists(queryWrapper, pageNo, pageSize);
         return CommonResult.success(data);
     }
 
@@ -856,13 +855,13 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
     public CommonResult getAdminBaseMenu() {
         try {
             checkouRole();
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             return CommonResult.failed(e.getMessage());
         }
-        AdminBaseMenu adminBaseMenu=new AdminBaseMenu();
-        QueryWrapper<AdminBaseMenu> queryWrapper=new QueryWrapper(adminBaseMenu);
-        String menu_id= getParameter("menu_id");
-        if(StringUtils.isEmpty(menu_id)){
+        AdminBaseMenu adminBaseMenu = new AdminBaseMenu();
+        QueryWrapper<AdminBaseMenu> queryWrapper = new QueryWrapper(adminBaseMenu);
+        String menu_id = getParameter("menu_id");
+        if (StringUtils.isEmpty(menu_id)) {
             return CommonResult.failed("缺少必要字段");
         }
         queryWrapper.eq("menu_id", menu_id);
@@ -871,7 +870,7 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
 
     @Override
     public CommonResult saveAdminBaseMenu(AdminBaseMenu adminBaseMenu) {
-        if(!save(adminBaseMenu)){
+        if (!save(adminBaseMenu)) {
             return CommonResult.failed("新增失败");
         }
         return CommonResult.success("新增成功");
@@ -879,7 +878,7 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
 
     @Override
     public CommonResult updateAdminBaseMenu(AdminBaseMenu adminBaseMenu) {
-        if(!edit(adminBaseMenu)){
+        if (!edit(adminBaseMenu)) {
             return CommonResult.failed("更新失败");
         }
         return CommonResult.success("更新成功");
@@ -888,11 +887,12 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl<AdminBaseMenuMappe
 
     /**
      * 校验是否为平台
+     *
      * @return
      */
-    private void checkouRole(){
-        if(!ContextUtil.checkouRole()){
-          throw new RuntimeException("没有相关权限");
+    private void checkouRole() {
+        if (!ContextUtil.checkouRole()) {
+            throw new RuntimeException("没有相关权限");
         }
     }
 
diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java b/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java
index 44148c85..fe72674f 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java
@@ -40,7 +40,7 @@ public class ContextUtil {
     public static UserDto getCurrentUser() {
         try {
             UserDto loginUser = staticUserInfoService.getUser();
-            log.info("##### 当前登录用户：{}###", JsonUtil.object2json(loginUser));
+//            log.info("##### 当前登录用户：{}###", JsonUtil.object2json(loginUser));
             return loginUser;
         } catch (Exception e) {
             System.out.println(e.getMessage());
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
index 85f0f549..15ae7aec 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
@@ -221,7 +221,7 @@ public class LakalaPayServiceImpl implements LakalaPayService {
         if (StrUtil.isBlank(orderId)) {
             throw new ApiException("订单号不能为空！");
         }
-        
+
         if (StrUtil.isBlank(totalAmount)) {
             throw new ApiException("订单总金额不能为空！");
         }
@@ -238,14 +238,13 @@ public class LakalaPayServiceImpl implements LakalaPayService {
             JSONObject reqData = new JSONObject();
 
             // 基本交易信息
-            reqData.put("merchant_no", agentMerchantNo); // 商户号
+            reqData.put("merchant_no", merchantNo); // 商户号
             reqData.put("term_no", termNo); // 终端号
             reqData.put("out_trade_no", orderId); // 商户订单号
             reqData.put("account_type", "WECHAT"); // 账户类型：微信支付
             reqData.put("trans_type", "51"); // 交易类型：JSAPI
             reqData.put("total_amount", totalAmount); // 总金额（单位：分）
             reqData.put("subject", subject); // 订单标题
-            reqData.put("settle_type", "1"); // 结算类型：分账类型
             reqData.put("notify_url", notifyURL); // 异步通知地址
             reqData.put("remark", remark); // 备注
 
@@ -266,6 +265,8 @@ public class LakalaPayServiceImpl implements LakalaPayService {
             outSplitInfo.put("merchant_no", agentMerchantNo); // 分账商户号
             outSplitInfo.put("term_no", agentTermNo); // 分账终端号
             outSplitInfo.put("amount", agentAmount); // 分账金额
+            outSplitInfo.put("settle_type", "0"); // "0"或者空，常规结算方式
+            outSplitInfo.put("sub_remark", "收取订单运费"); // 子单备注信息
             reqData.put("out_split_info", outSplitInfo);
 
             // 5. 构造请求体
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index 6ec9cccc..d3c9d40d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -4824,7 +4824,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         List<Long> product_ids = orderItemList.stream().map(ShopOrderItem::getProduct_id).collect(Collectors.toList());
         List<ShopProductIndex> indexList = shopProductIndexService.gets(product_ids);
 
-        if (CheckUtil.checkDataRights(user_id, orderBaseList, ShopOrderBase::getBuyer_user_id) || CheckUtil.checkDataRights(store_id, orderBaseList, ShopOrderBase::getStore_id)) {
+        if (CheckUtil.checkDataRights(user_id, orderBaseList, ShopOrderBase::getBuyer_user_id)
+                || CheckUtil.checkDataRights(store_id, orderBaseList, ShopOrderBase::getStore_id)) {
             // 判断是否为供应商代发订单
             QueryWrapper<ShopOrderInfo> infoQueryWrapper = new QueryWrapper<>();
             infoQueryWrapper.in("src_order_id", order_ids);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index 524fc96d..c10fb612 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -3284,7 +3284,7 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
 
 
             QueryWrapper<ShopStoreEmployee> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("store_id", storeId).eq("user_id", userId);
+            queryWrapper.eq("store_id", storeId).eq("user_id", userId).eq("employee_is_admin", CommonConstant.Enable);
             if (shopStoreEmployeeService.count(queryWrapper) <= 0) {
                 // shop_store_employee 店铺员工，添加管理员
                 ShopStoreEmployee shopStoreEmployee = new ShopStoreEmployee();
@@ -3481,7 +3481,8 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
             UpdateWrapper<ShopStoreEmployee> queryWrapper = new UpdateWrapper<>();
             queryWrapper.eq("user_id", userId).eq("store_id", storeId)
                     .set("rights_group_id", CollUtil.join(rights_group_id, ","))
-                    .set("employee_is_admin", CommonConstant.USER_TYPE_ADMIN);
+                    .set("employee_is_admin", CommonConstant.Enable)
+                    .set("employee_is_kefu", CommonConstant.Enable);
             if (!shopStoreEmployeeService.update(queryWrapper)) {
 //                throw new ApiException(I18nUtil._("设置店铺管理员权限失败"));
                 log.error("设置店铺管理员权限失败！");