dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/IndexController.java

@@ -1,8 +1,6 @@
 package com.ruoyi.web.controller.common;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.user.domain.vo.UserStatisticsVo;
@@ -59,7 +57,7 @@ public class IndexController extends BaseController {
     public R<Map<String, Object>> businessSimpleStatistics() {
         HashMap<String, Object> map = new HashMap<>();
         Long businessId = getBusinessId(true);
-          map.put("todayAmount", 0);
+        map.put("todayAmount", 0);
         map.put("todayOrderNum", 0);
         //活跃用户
         map.put("activeUser", userService.activeUserCount(businessId));

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderServiceImpl.java

@@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
 import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 import com.ruoyi.business.domain.vo.BusinessLogisticsConfigVo;
 import com.ruoyi.business.service.IBusinessLogisticsConfigService;
 import com.ruoyi.business.service.IBusinessService;
-
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.CallInterfaceStatus;
@@ -20,7 +18,6 @@ import com.ruoyi.common.enums.order.MarketingType;
 import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.common.utils.MathUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.newwxpay.pay.PayNotifyResult;
 import com.ruoyi.shop.business.domain.bo.UserBusinessChangeIntegralBo;
@@ -786,7 +783,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
     public void splitMoney(ShopOrder order) {
         this.toOrderIncome( order);
         try {
-            //TODO 开始分账
+            //TODO 开始分账,还要记录分账日志
 
             //如果分账成功
             List<BusinessOrderGains> list = businessOrderGainsService.loadOrderGains(order.getOrderId());

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderServiceImpl.java

@@ -1123,7 +1123,7 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
         rightsOrder.setRightsRefundStatus(RightsRefundStatus.SUCCESS);
         baseMapper.updateById(rightsOrder);
         ShopOrder shopOrder = shopOrderService.loadByLockId(rightsOrder.getOrderId(), true);
-        if (rightsOrder.getIsAllRights()) {
+        if (Boolean.TRUE.equals(rightsOrder.getIsAllRights())) {
             shopOrderService.refundOperate(shopOrder, rightsOrder.getRightsType());
         } else {
 
@@ -1141,7 +1141,7 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
             businessOrderGainsService.refund(rightsOrder);
         }
 
-        if(shopOrder.getEnd())
+        if(Boolean.TRUE.equals(shopOrder.getEnd()))
         {
             //TODO 开始分账
             shopOrderService.splitMoney(shopOrder);

ruoyi-user/src/main/java/com/ruoyi/useraddress/domain/UserAddress.java

@@ -1,14 +1,12 @@
 package com.ruoyi.useraddress.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
 
 /**
  * 用户地址对象 tb_user_address
@@ -16,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-04-02
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tb_user_address")
 public class UserAddress extends BaseTimeEntity {