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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -5836,12 +5836,18 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         }
 
         // 取消支付
+        BigDecimal payAmount = boilerTaskOrderDO.getPayAmount();
         if (payInfo.getIsCancel() != null && payInfo.getIsCancel()) {
             LambdaUpdateWrapper<BoilerTaskOrderDO> wrap = new LambdaUpdateWrapper<>();
             wrap.eq(BoilerTaskOrderDO::getId, boilerTaskOrderDO.getId());
 
-            wrap.set(BoilerTaskOrderDO::getPaymentStatus, 0);
-            wrap.set(BoilerTaskOrderDO::getPayAmount, 0);
+            if (payAmount == null || payAmount.compareTo(BigDecimal.ZERO) == 0 || payAmount.equals(payInfo.getChargeAmount())) {
+                wrap.set(BoilerTaskOrderDO::getPayAmount, 0);
+                wrap.set(BoilerTaskOrderDO::getPaymentStatus, 0);
+            }else{
+                wrap.set(BoilerTaskOrderDO::getPayAmount, payAmount.subtract(payInfo.getChargeAmount()));
+                wrap.set(BoilerTaskOrderDO::getPaymentStatus, 1);
+            }
             wrap.set(BoilerTaskOrderDO::getPayTime, null);
             boilerTaskOrderMapper.update(wrap);
             return true;
@@ -5849,7 +5855,6 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
         updateOrder.setId(boilerTaskOrderDO.getId());
-        updateOrder.setPaymentStatus(1);
         String chargeTime = payInfo.getChargeTime();
         try {
             LocalDateTime localDateTime = DateUtils.parseDateTimeWithMultipleFormats(chargeTime);
@@ -5859,9 +5864,17 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             updateOrder.setPayTime(LocalDateTime.now());
         }
         try {
-            updateOrder.setPayAmount(payInfo.getChargeAmount());
-            if (payInfo.getChargeAmount() == null) {
-                updateOrder.setPayAmount(boilerTaskOrderDO.getActualAmount());
+//            updateOrder.setPayAmount(payInfo.getChargeAmount());
+//            if (payInfo.getChargeAmount() == null) {
+//                updateOrder.setPayAmount(boilerTaskOrderDO.getActualAmount());
+//            }
+            // 如果全部缴费满了
+            if (boilerTaskOrderDO.getServiceAmount().equals(payAmount.add(payInfo.getChargeAmount()))) {
+                updateOrder.setPayAmount(boilerTaskOrderDO.getServiceAmount());
+                updateOrder.setPaymentStatus(1);
+            }else{
+                updateOrder.setPayAmount(payAmount.add(payInfo.getChargeAmount()));
+                updateOrder.setPaymentStatus(2);
             }
 
         } catch (Exception e) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -5671,12 +5671,18 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         }
 
         // 取消支付
+        BigDecimal payAmount = pipeTaskOrderDO.getPayAmount();
         if (payInfo.getIsCancel() != null && payInfo.getIsCancel()) {
             LambdaUpdateWrapper<PipeTaskOrderDO> wrap = new LambdaUpdateWrapper<>();
             wrap.eq(PipeTaskOrderDO::getId, pipeTaskOrderDO.getId());
 
-            wrap.set(PipeTaskOrderDO::getPaymentStatus, 0);
-            wrap.set(PipeTaskOrderDO::getPayAmount, 0);
+            if (payAmount == null || payAmount.compareTo(BigDecimal.ZERO) == 0 || payAmount.equals(payInfo.getChargeAmount())) {
+                wrap.set(PipeTaskOrderDO::getPaymentStatus, 0);
+                wrap.set(PipeTaskOrderDO::getPayAmount, 0);
+            }else{
+                wrap.set(PipeTaskOrderDO::getPaymentStatus, 1);
+                wrap.set(PipeTaskOrderDO::getPayAmount, payAmount.subtract(payInfo.getChargeAmount()));
+            }
             wrap.set(PipeTaskOrderDO::getPayTime, null);
             pipeTaskOrderMapper.update(wrap);
             return true;
@@ -5684,7 +5690,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         PipeTaskOrderDO updateOrder = new PipeTaskOrderDO();
         updateOrder.setId(pipeTaskOrderDO.getId());
-        updateOrder.setPaymentStatus(1);
+//        updateOrder.setPaymentStatus(1);
         String chargeTime = payInfo.getChargeTime();
         try {
             LocalDateTime localDateTime = DateUtils.parseDateTimeWithMultipleFormats(chargeTime);
@@ -5694,9 +5700,17 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             updateOrder.setPayTime(LocalDateTime.now());
         }
         try {
-            updateOrder.setPayAmount(payInfo.getChargeAmount());
-            if (payInfo.getChargeAmount() == null) {
-                updateOrder.setPayAmount(pipeTaskOrderDO.getActualAmount());
+//            updateOrder.setPayAmount(payInfo.getChargeAmount());
+//            if (payInfo.getChargeAmount() == null) {
+//                updateOrder.setPayAmount(boilerTaskOrderDO.getActualAmount());
+//            }
+            // 如果全部缴费满了
+            if (pipeTaskOrderDO.getServiceAmount().equals(payAmount.add(payInfo.getChargeAmount()))) {
+                updateOrder.setPayAmount(pipeTaskOrderDO.getServiceAmount());
+                updateOrder.setPaymentStatus(1);
+            }else{
+                updateOrder.setPayAmount(payAmount.add(payInfo.getChargeAmount()));
+                updateOrder.setPaymentStatus(2);
             }
 
         } catch (Exception e) {