子订单编号问题

src/main/java/com/caimei/service/impl/OrderSubmitServiceImpl.java

@@ -15,6 +15,7 @@ import com.caimei.util.MathUtil;
 import com.caimei.util.OrderNoUtils;
 import com.caimei.util.ProductUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -805,7 +806,7 @@ public class OrderSubmitServiceImpl implements OrderSubmitService {
         // 子订单编号
         String shopOrderNo = "";
         String maxShopOrderNo = orderSubmitMapper.findMaxShopOrderNo(order.getOrderID());
-        if (null == maxShopOrderNo || "".equals(maxShopOrderNo)) {
+        if (StringUtils.isNotBlank(maxShopOrderNo)) {
             shopOrderNo = maxShopOrderNo;
             shopOrder.setShopOrderNo(OrderNoUtils.getShopOrderNo(order.getOrderNo(), Integer.parseInt(shopOrderNo.substring(shopOrderNo.length() - 2, shopOrderNo.length())) + 1));
         } else {

src/main/resources/mapper/OrderSubmitMapper.xml

@@ -536,7 +536,7 @@
     <select id="findMaxShopOrderNo" resultType="java.lang.String">
         SELECT shopOrderNo
         FROM cm_shop_order
-        WHERE orderID IS NOT NULL
+        WHERE orderID = #{orderId}
         ORDER BY shopOrderNo DESC
         LIMIT 1
     </select>