Merge branch 'v17.5_order_child_sync_broker_20240617'

performance-api/src/main/java/com/clx/performance/param/pc/payment/WalletResidueDTO.java

@@ -49,7 +49,7 @@ public class WalletResidueDTO {
 	}
 	@JsonGetter(value="frozen")
 	public BigDecimal frozenFormat() {
-		return new BigDecimal(new Double(this.frozen)/100);
+		return BigDecimal.valueOf(new Double(this.frozen)/100);
 	}
 	@JsonGetter(value="residue")
 	public Double residueFormat() {
@@ -57,7 +57,7 @@ public class WalletResidueDTO {
 	}
 	@JsonGetter(value="deposit")
 	public Double depositFormat() {
-		return new Double(this.deposit)/100;
+		return this.deposit/100;
 	}
 
 	public Double getDeposit() {

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

@@ -480,7 +480,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 新增运单
         orderChildDao.saveEntity(orderChild);
         // 冻结司机保证金
-        if(deposit.compareTo(BigDecimal.ZERO) ==1){
+        if(deposit.compareTo(BigDecimal.ZERO) > 0){
             PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
             payPlatformFeeParam.setTradeNo(childNo);
             payPlatformFeeParam.setFrom(checkWalletCode);

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

@@ -383,6 +383,7 @@ public class PaymentServiceImpl implements PaymentService {
                 orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
         if (null == orderPaymentOptional){
             log.error("数据不存在 {}, {}" ,orderNo,msg);
+            return;
         }
         orderPaymentOptional.setStatus(PaymentStatusEnum.FAIL.getValue());
         orderPaymentOptional.setReason(msg);
@@ -396,6 +397,7 @@ public class PaymentServiceImpl implements PaymentService {
                 orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
         if (null == orderPaymentOptional){
             log.error("数据不存在 {}, {}" ,orderNo);
+            return;
         }
         orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
         orderPaymentDao.updateEntityByKey(orderPaymentOptional);
@@ -408,6 +410,7 @@ public class PaymentServiceImpl implements PaymentService {
         OrderPayment orderPaymentOptional = orderPaymentDao.getEntityByKey(Integer.valueOf(id)).orNull();
         if (null == orderPaymentOptional){
             log.error("数据不存在 {}, {}" ,id);
+            return;
         }
         orderPaymentOptional.setStatus(status);
         orderPaymentDao.updateEntityByKey(orderPaymentOptional);
@@ -419,6 +422,7 @@ public class PaymentServiceImpl implements PaymentService {
                 orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
         if (null == orderPaymentOptional){
             log.error("数据不存在 {}, {}" ,orderNo);
+            return;
         }
         orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
         orderPaymentOptional.setSerialNo(serialNo);