Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2893,7 +2893,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 String autoName = itemInfo.getKey().getAutoName();
                 String autoContent = itemInfo.getValue().getAutoContent();
                 originalResultMap.put(autoName,autoContent);
-                if (NumberUtils.isCreatable(autoContent)) {
+                if (NumberUtils.isCreatable(autoContent) && new BigDecimal(autoContent).compareTo(new BigDecimal(100))<0) {
                     if ("毛重".equals(autoName)) {
                         vo.setGrossWeight(new BigDecimal(autoContent));
                     }else if ("皮重".equals(autoName)) {

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -383,7 +383,7 @@ public class PaymentServiceImpl implements PaymentService {
                 orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
         if (null == orderPaymentOptional){
             log.error("数据不存在 {}, {}" ,orderNo,msg);
-            return;
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
         }
         orderPaymentOptional.setStatus(PaymentStatusEnum.FAIL.getValue());
         orderPaymentOptional.setReason(msg);
@@ -396,8 +396,7 @@ public class PaymentServiceImpl implements PaymentService {
         OrderPayment orderPaymentOptional =
                 orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
         if (null == orderPaymentOptional){
-            log.error("数据不存在 {}, {}" ,orderNo);
-            return;
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
         }
         orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
         orderPaymentDao.updateEntityByKey(orderPaymentOptional);