需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -121,9 +121,10 @@ public class CommonLogic {
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
 
-            AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).last("limit 1").one();
-            if (adminUserDeptRela != null) {
-                adminUserCom.setAdminDept(adminDeptService.getById(adminUserDeptRela.getAdminDeptId()));
+            List<AdminUserDeptRela> adminUserDeptRelas = adminUserDeptRelaService.lambdaQuery().in(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).list();
+            if (!CollectionUtils.isEmpty(adminUserDeptRelas)) {
+                List<String> deptIds = adminUserDeptRelas.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
+                adminUserCom.setAdminDept(adminDeptService.lambdaQuery().in(AdminDept::getAdminDeptId,deptIds).list());
             }
 
             return adminUserCom;
@@ -202,7 +203,7 @@ public class CommonLogic {
             websitIds.addAll(adminWebsitIds);
 
 
-            AdminWebsit adminWebsit = adminWebsitService.getById(adminWebsitIds.get(0));
+            adminWebsitService.lambdaQuery().eq();
             adminUserCom.setCompanyWechatIds(companyWechatIds);
             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
             adminUserCom.setOnlyRead(companyWechatIds.size() > 1);

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderOfflineRefundLogic.java

@@ -134,7 +134,7 @@ public class OrderOfflineRefundLogic {
         //总退货金额
         BigDecimal totalRefundAmount = new BigDecimal(0);
         for(OrderOfflineRefundItem item : orderOfflineRefundItems){
-            totalRefundAmount = totalRefundAmount.add(BigDecimal.valueOf(item.getRefundNum()));
+            totalRefundAmount = totalRefundAmount.add(item.getRefundAmount().multiply(BigDecimal.valueOf(item.getRefundNum())));
         }
         OrderOfflineRefund orderOfflineRefund = new OrderOfflineRefund();
         orderOfflineRefund.setId(orderOfflineRefundAddBean.getId());
@@ -197,7 +197,7 @@ public class OrderOfflineRefundLogic {
             }
 
             //本次退货金额
-            itemRefundAmount = itemRefundAmount.add(item.getRefundAmount());
+            itemRefundAmount = itemRefundAmount.add(item.getRefundAmount().multiply(BigDecimal.valueOf(item.getRefundNum())));
         }
         if(waitRefundAmount.doubleValue() < itemRefundAmount.doubleValue()){
             throw new RemoteServiceException("退货总金额超出了本订单的可退金额，请检查");