Merge branch 'master' into 3.0

# Conflicts:
#	cost-service/src/main/resources/mapper/Cost.xml

README.md

@@ -2,9 +2,6 @@
 
 项目流转: 符式酉 -> 李灿浩 ->吴通 ->尹勇
 
-### 流程图
-![流程图](http://dcfile.blsct.com/%E8%B4%B9%E7%94%A8%E7%B3%BB%E7%BB%9F%E9%80%BB%E8%BE%91.png)
-
 ### 操作
  [管理成本费用单明细SQL](http://code.bailuntec.com/bltdc/dc-cost-system/wikis/%E7%AE%A1%E7%90%86%E6%88%90%E6%9C%AC%E8%B4%B9%E7%94%A8%E5%8D%95%E6%98%8E%E7%BB%86SQL)
  

cost-service/src/main/java/com/blt/other/module/cost/controller/CostController.java

@@ -334,17 +334,23 @@ public class CostController {
     @ApiOperation("财务付款回调接口")
     @PostMapping(value = {"check/CashierCallbackUrl", "check/lend/CashierCallbackUrl"})
     public Map<String, Object> cashierCallbackUrl(@RequestBody CashierCallbackUrlVo cashierCallbackUrlVo) {
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("success", true);
+        result.put("msg", "success");
+        result.put("result", true);
+
         String costNo = cashierCallbackUrlVo.getId().toUpperCase();
+        if (!(costNo.startsWith("F") || costNo.startsWith("SF"))) {
+            return result;
+        }
         if (costNo.contains("-")) {
             costNo = costNo.split("-")[0];
         }
         costService = CostServiceFactory.getCostService(costNo);
         costService.cashierCallback(cashierCallbackUrlVo);
 
-        Map<String, Object> result = new HashMap<>();
-        result.put("success", true);
-        result.put("msg", "success");
-        result.put("result", true);
+
         return result;
     }
 

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

@@ -439,7 +439,7 @@ public abstract class AbstractCostService implements CostService {
         CostDomain costDomain = this.getCostByCostNo(costCashiercallbackDomain.getCostNo());
 
         // 获取xx货币-->CNY的汇率
-        if (costCashiercallbackDomain.getCashierunitcode() != null) {
+        if (com.bailuntec.common.StringUtils.isNotEmpty(costCashiercallbackDomain.getCashierunitcode())) {
             BigDecimal toRmbRate = CurUtils.getCur(costCashiercallbackDomain.getCashierunitcode().toUpperCase(), "CNY");
             costCashiercallbackDomain.setToRmbRate(toRmbRate);
             costDomain.setToRmbRate(toRmbRate);

cost-service/src/main/resources/mapper/Cost.xml

@@ -544,6 +544,7 @@
             and (t1.bank_card_user like concat('%',#{req.costNo},'%') or t1.cost_no = #{req.costNo})
         </if>
         <include refid="checkCostListSearch"/>
+        group by t1.id
     </select>
 
     <!--需要我人事审核的-->