if received amount lt zero

java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.core.smo.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.context.Environment;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.core.factory.CallApiServiceFactory;
@@ -9,6 +10,7 @@ import com.java110.dto.app.AppDto;
 import com.java110.dto.assetImportLog.AssetImportLogDto;
 import com.java110.intf.common.ITransactionLogInnerServiceSMO;
 import com.java110.po.transactionLog.TransactionLogPo;
+import com.java110.utils.factory.ApplicationContextFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Async;
@@ -32,6 +34,9 @@ public class SaveTransactionLogSMOImpl implements ISaveTransactionLogSMO {
     @Autowired(required = false)
     private RestTemplate restTemplate;
 
+    @Autowired(required = false)
+    private RestTemplate outRestTemplate;
+
     @Override
     @Async
     public void saveLog(TransactionLogPo transactionLogPo) {
@@ -41,11 +46,17 @@ public class SaveTransactionLogSMOImpl implements ISaveTransactionLogSMO {
     @Override
     @Async
     public void saveAssetImportLog(AssetImportLogDto assetImportLogDto) {
+
         String apiUrl = "http://api-service/api/assetImportLog/saveAssetImportLog";
+        RestTemplate tmpRestTemplate = restTemplate;
+        if (Environment.isStartBootWay()) {
+            apiUrl = "http://127.0.0.1:8008/api/assetImportLog/saveAssetImportLog";
+            tmpRestTemplate = outRestTemplate;
+        }
         IPageData newPd = PageData.newInstance().builder("-1", "批量日志", "", "",
                 "", "", apiUrl, "",
                 AppDto.WEB_APP_ID);
 
-        CallApiServiceFactory.callCenterService(restTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
+        CallApiServiceFactory.callCenterService(tmpRestTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
     }
 }

service-job/src/main/java/com/java110/job/adapt/fee/PayFeeDetailToMonthAdapt.java

@@ -111,6 +111,10 @@ public class PayFeeDetailToMonthAdapt extends DatabusAdaptImpl {
      * @param businessPayFeeDetail
      */
     private void doPayFeeDetail(Business business, JSONObject businessPayFeeDetail) {
+        if(businessPayFeeDetail.containsKey("receivedAmount")
+                && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+            return ;
+        }
         payFeeDetailToMonthImpl.doPayFeeDetail(business,businessPayFeeDetail);
     }
 

service-job/src/main/java/com/java110/job/adapt/payment/coupon/PayFeeGiftCouponAdapt.java

@@ -146,6 +146,10 @@ public class PayFeeGiftCouponAdapt extends DatabusAdaptImpl {
 
             Assert.listOnlyOne(feeDtos, "未查询到费用信息");
 
+            if(businessPayFeeDetail.containsKey("receivedAmount")
+                    && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+                return ;
+            }
 
             CouponRuleFeeDto couponRuleFeeDto = new CouponRuleFeeDto();
             couponRuleFeeDto.setFeeConfigId(feeDtos.get(0).getConfigId());

service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java

@@ -157,6 +157,11 @@ public class PayFeeGiftIntegralAdapt extends DatabusAdaptImpl {
 
             Assert.listOnlyOne(feeDtos, "未查询到费用信息");
 
+            if(businessPayFeeDetail.containsKey("receivedAmount")
+                    && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+                return ;
+            }
+
             IntegralRuleFeeDto integralRuleFeeDto = new IntegralRuleFeeDto();
             integralRuleFeeDto.setFeeConfigId(feeDtos.get(0).getConfigId());
             integralRuleFeeDto.setCurTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));

service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java

@@ -145,6 +145,13 @@ public class PayFeeReceiptAdapt extends DatabusAdaptImpl {
             //查询业主信息
             OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
 
+            // if received amount lt zero
+
+            if(businessPayFeeDetail.containsKey("receivedAmount")
+                    && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+                return ;
+            }
+
             //添加单元信息
             FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
             FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();