bug修复

ruoyi-business/src/main/resources/mapper/agent/AgentApplyMapper.xml

@@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.idCard != null and bo.idCard != ''">
                 and a.id_card like concat('%', #{bo.idCard}, '%')
             </if>
+            <if test="bo.phone != null and bo.phone != ''">
+                and a.phone like concat('%', #{bo.phone}, '%')
+            </if>
             <if test="bo.provinceCode != null and bo.provinceCode != ''">
                 and a.province_code = #{bo.provinceCode}
             </if>

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -238,7 +238,7 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
         BigDecimal total = payTotalAmount.add(bo.getOrderAmount());
         if(info.gtOnlineOrderUserYearConsumptionLimit(total))
         {
-            throw new ServiceException(String.format("用户年累计消费金额超出限制，请勿下单！当前累计金额：%s", total));
+            throw new ServiceException(String.format("用户年累计消费金额超出%s限制", info.getOnlineOrderUserYearConsumptionLimit()));
         }
 
         OnlineOrder onlineOrder = new OnlineOrder();

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -540,7 +540,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
      */
     private BigDecimal sharedSubsidyHandle(OnlineOrder order, SubsidyMode currentMode, BigDecimal sharedSubsidy) {
         if (currentMode.getImmediateArrival()) {
-            if (sharedSubsidy.compareTo(BigDecimal.ZERO) == 0) {
+            if (sharedSubsidy.compareTo(BigDecimal.ZERO) <= 0) {
                 return BigDecimal.ZERO;
             }
             Long businessId = order.getBusinessId();
@@ -557,7 +557,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
     public BigDecimal sharedSubsidyCompute(Long businessId, BigDecimal sharedSubsidy) {
         String businessName = businessService.queryNameById(businessId);
         while (true) {
-            if (sharedSubsidy.compareTo(BigDecimal.ZERO) == 0) {
+            if (sharedSubsidy.compareTo(BigDecimal.ZERO) <= 0) {
                 return BigDecimal.ZERO;
             }