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

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/pc/PcOrderEvaluationHeaderController.java

@@ -29,7 +29,7 @@ public class PcOrderEvaluationHeaderController extends BaseController {
     public TableDataInfo<OrderEvaluationListVo> getEvaluationList(OrderEvaluationHeaderBo bo, PageQuery pageQuery) {
         // 获取当前登录用户的企业ID
         Long customerId = LoginHelper.getLoginUser().getCustomerId();
-        return orderEvaluationHeaderService.getEvaluationOrderList(customerId, bo.getEvaluationStatus(), pageQuery);
+        return orderEvaluationHeaderService.getEvaluationOrderList(customerId, bo.getEvaluationStatus(), bo.getIsSplitChild(), pageQuery);
     }
 
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderEvaluationHeaderBo.java

@@ -74,6 +74,8 @@ public class OrderEvaluationHeaderBo extends BaseEntity {
 
     private String evaluationStatus;
 
+    private String isSplitChild;
+
     List<OrderEvaluationItemBo> orderEvaluationItemList;
 
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderMainMapper.java

@@ -31,6 +31,6 @@ public interface OrderMainMapper extends BaseMapperPlus<OrderMain, OrderMainVo>
     /**
      * 查询客户的所有已完成订单（主信息 + 评价状态）
      */
-    IPage<OrderEvaluationListVo> selectEvaluationMainListPage(IPage<?> page, @Param("customerId") Long customerId, @Param("evaluationStatus") String evaluationStatus);
+    IPage<OrderEvaluationListVo> selectEvaluationMainListPage(IPage<?> page, @Param("customerId") Long customerId, @Param("evaluationStatus") String evaluationStatus, @Param("isSplitChild") String isSplitChild);
 
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderEvaluationHeaderService.java

@@ -44,7 +44,7 @@ public interface IOrderEvaluationHeaderService extends IService<OrderEvaluationH
      */
     TableDataInfo<OrderEvaluationHeaderVo> queryPageList(OrderEvaluationHeaderBo bo, PageQuery pageQuery);
 
-    TableDataInfo<OrderEvaluationListVo> getEvaluationOrderList(Long customerId, String evaluationStatus, PageQuery pageQuery);
+    TableDataInfo<OrderEvaluationListVo> getEvaluationOrderList(Long customerId, String evaluationStatus, String isSplitChild, PageQuery pageQuery);
 
     /**
      * 查询符合条件的订单评价主列表

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderEvaluationHeaderServiceImpl.java

@@ -135,13 +135,13 @@ public class OrderEvaluationHeaderServiceImpl extends ServiceImpl<OrderEvaluatio
     }
 
     @Override
-    public TableDataInfo<OrderEvaluationListVo> getEvaluationOrderList(Long customerId, String evaluationStatus, PageQuery pageQuery) {
+    public TableDataInfo<OrderEvaluationListVo> getEvaluationOrderList(Long customerId, String evaluationStatus, String isSplitChild, PageQuery pageQuery) {
 
         if (evaluationStatus != null && "2".equals(evaluationStatus)) {
             evaluationStatus = "1";
         }
         // 1. 分页查询主订单（含评价状态）
-        IPage<OrderEvaluationListVo> page = orderMainMapper.selectEvaluationMainListPage(pageQuery.build(), customerId, evaluationStatus);
+        IPage<OrderEvaluationListVo> page = orderMainMapper.selectEvaluationMainListPage(pageQuery.build(), customerId, evaluationStatus, isSplitChild);
         List<OrderEvaluationListVo> orders = page.getRecords();
 
         if (!orders.isEmpty()) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderEvaluationServiceImpl.java

@@ -71,7 +71,7 @@ public class OrderEvaluationServiceImpl extends ServiceImpl<OrderEvaluationMappe
     @Override
     public TableDataInfo<OrderEvaluationListVo> getEvaluationOrderList(Long customerId, String evaluationStatus, PageQuery pageQuery) {
         // 1. 分页查询主订单（含评价状态）
-        IPage<OrderEvaluationListVo> page = orderMainMapper.selectEvaluationMainListPage(pageQuery.build(), customerId, evaluationStatus);
+        IPage<OrderEvaluationListVo> page = orderMainMapper.selectEvaluationMainListPage(pageQuery.build(), customerId, null, evaluationStatus);
         List<OrderEvaluationListVo> orders = page.getRecords();
 
         if (!orders.isEmpty()) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -141,7 +141,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         RemoteCustomerSalesVo remoteCustomerSalesVo = remoteCustomerSalesService.selectCustomerSalesInfoByCustomerId(orderMainVo.getCustomerId());
         if (null != remoteCustomerSalesVo) {
             orderMainVo.setCreditLimit(remoteCustomerSalesVo.getCreditAmount());
-            orderMainVo.setRemainingQuota(remoteCustomerSalesVo.getRemainingQuota());
+            orderMainVo.setRemainingQuota(remoteCustomerSalesVo.getTemporaryQuota().add(remoteCustomerSalesVo.getCreditAmount()));
             orderMainVo.setTemporaryQuota(remoteCustomerSalesVo.getTemporaryQuota());
         }
 

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMainMapper.xml

@@ -26,6 +26,7 @@
         FROM order_main o
         WHERE
         o.customer_id = #{customerId}
+        AND o.is_split_child = #{isSplitChild}
         AND o.order_status = '5'
         AND o.del_flag = '0'
 
@@ -42,6 +43,7 @@
                SUM(CASE WHEN order_status = '4' THEN 1 ELSE 0 END) AS pendingReceiptCount
         FROM order_main
         WHERE customer_id = #{customerId}
+          AND is_split_child = '1'
           AND del_flag = '0'
     </select>
 </mapper>