Merge branch 'master' into 3.0

cost-service/src/main/java/com/blt/other/database/model/CostCashiercallbackDomain.java

@@ -9,6 +9,7 @@ public class CostCashiercallbackDomain {
     private Integer id;
     private String costNo;
     private String message;
+
     private Integer payid;
     private String payno;
     private BigDecimal payamount;

cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -435,16 +435,21 @@ public abstract class AbstractCostService implements CostService {
     }
 
     void cashierCallbackPass(CostCashiercallbackDomain costCashiercallbackDomain) {
+
+        CostDomain costDomain = this.getCostByCostNo(costCashiercallbackDomain.getCostNo());
+
         // 获取xx货币-->CNY的汇率
-        BigDecimal toRmbRate = CurUtils.getCur(costCashiercallbackDomain.getCashierunitcode().toUpperCase(), "CNY");
-        costCashiercallbackDomain.setToRmbRate(toRmbRate);
+        if (costCashiercallbackDomain.getCashierunitcode() != null) {
+            BigDecimal toRmbRate = CurUtils.getCur(costCashiercallbackDomain.getCashierunitcode().toUpperCase(), "CNY");
+            costCashiercallbackDomain.setToRmbRate(toRmbRate);
+            costDomain.setToRmbRate(toRmbRate);
+        }
 
         //  保存出纳付款记录
         Integer integer = costCashiercallbackService.saveCostCashiercallbackResponse(costCashiercallbackDomain);
         log.warn("保存出纳付款信息成功：" + integer + "   " + costCashiercallbackDomain);
 
         //  付款成功，更改费用单信息，否则返回失败
-        CostDomain costDomain = this.getCostByCostNo(costCashiercallbackDomain.getCostNo());
         costDomain.setCostStatus(4);
 
         if (null != costDomain.getIsLend()) {
@@ -452,10 +457,10 @@ public abstract class AbstractCostService implements CostService {
                 costDomain.setLendStatus(1);
             }
         }
+        costDomain.setAmountRmb(costCashiercallbackDomain.getCashierpaymoneyrmb());
         costDomain.setPayUserId(costCashiercallbackDomain.getPayuserid());
         costDomain.setPayTime(new Date());
-        costDomain.setAmountRmb(costCashiercallbackDomain.getCashierpaymoneyrmb());
-        costDomain.setToRmbRate(toRmbRate);
+
         this.updateCost(costDomain);
         costLogService.save(costCashiercallbackDomain.getCostNo(), costCashiercallbackDomain.getPayuserid(), "出纳收/付款成功：" + costCashiercallbackDomain.getPaynote());
     }