update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/CostPlanNewController.java

@@ -44,7 +44,7 @@ public class CostPlanNewController {
         Map<String, Object> result = new HashMap<>();
         CostPlanNoLock lock = CostPlanNoLock.getInstance();
         try {
-            lock.lock(costPlanNo.hashCode());
+            lock.lock(Math.abs(costPlanNo.hashCode()));
             CostPlanService costPlanService = CostPlanServiceFactory.getCostPlanService(costPlanNo);
 
             Integer affirm = costPlanService.affirm(costPlanNo);
@@ -53,10 +53,11 @@ public class CostPlanNewController {
 
             return result;
         } finally {
-            lock.unlock(costPlanNo.hashCode());
+            lock.unlock(Math.abs(costPlanNo.hashCode()));
         }
     }
 
+
     @ApiOperation("/删除费用计划")
     @PostMapping("/deleted")
     public Map<String, Object> deleted(@RequestParam String costPlanNo) {

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/PayCostServiceImpl.java

@@ -7,12 +7,12 @@ import com.bailuntec.common.BeanUtils;
 import com.bailuntec.common.JsonUtilByFsJson;
 import com.bailuntec.common.JsonUtilByJackson;
 import com.blt.other.common.exception.RpcException;
+import com.blt.other.database.model.CostTofinanceDomain;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostService;
 import com.blt.other.module.cost.vo.CashierCallbackUrlDataDataVo;
 import com.blt.other.module.cost.vo.CashierCallbackUrlDataVo;
 import com.blt.other.module.cost.vo.TofinanceVo;
-import com.blt.other.database.model.CostTofinanceDomain;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -49,19 +49,20 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
         //todo
         applyMoneyDetail.setMoneyRmb(cost.getAmount());
         applyMoneyDetail.setRemark("");
-
         applyMoneyDetailList.add(applyMoneyDetail);
 
         // 出纳申请金额明细(MoneyDetail)不可为空；
         req.setMoneyDetail(applyMoneyDetailList);
 
-
+        log.info("提交出纳参数:{}", JsonUtilByFsJson.beanToJson(req));
         CwResult<String> cwResult = cwApi.postApply(req);
+        log.info("提交出纳响应:{}", JsonUtilByFsJson.beanToJson(cwResult));
 
         if (!cwResult.getSuccess()) {
             throw new RpcException(cwResult.getMessage());
         }
 
+
         TofinanceVo tofinanceVo = JsonUtilByJackson.readValue(cwResult.getData().replaceAll("/^['|\"](.*)['|\"]$/", ""), TofinanceVo.class);
         //保存财务系统调用信息
         CostTofinanceDomain costTofinanceDomain = new CostTofinanceDomain();
@@ -75,9 +76,9 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
     public static void main(String[] args) {
 
 
-            CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
-            CashierCallbackUrlDataVo cashierCallbackUrlDataVo =new CashierCallbackUrlDataVo();
-            cashierCallbackUrlDataVo.setData(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo));
-            System.out.println(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataVo));
-        }
+        CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
+        CashierCallbackUrlDataVo cashierCallbackUrlDataVo = new CashierCallbackUrlDataVo();
+        cashierCallbackUrlDataVo.setData(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo));
+        System.out.println(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataVo));
     }
+}

bailuntec-cost-core/src/main/resources/application-test.yml

@@ -44,10 +44,10 @@ logging:
 cost:
   url:
     # fee
-    purchase-apply-callback-url-post: http://api.test.fee.bailuntec.com/purchase/other/purchasing/list/detail/ApplyCallbackUrl
-    purchase-cashier-callback-url-post: http://api.test.fee.bailuntec.com/purchase/other/purchasing/list/detail/CashierCallbackUrl
-    cost-apply-callback-url-post: http://api.test.fee.bailuntec.com/purchase/other/cost/check/ApplyCallbackUrl
-    cost-cashier-callback-url-post: http://api.test.fee.bailuntec.com/purchase/other/cost/check/CashierCallbackUrl
+    purchase-apply-callback-url-post: http://10.0.11.124/purchase/other/purchasing/list/detail/ApplyCallbackUrl
+    purchase-cashier-callback-url-post: http://10.0.11.124/purchase/other/purchasing/list/detail/CashierCallbackUrl
+    cost-apply-callback-url-post: http://10.0.11.124/purchase/other/cost/check/ApplyCallbackUrl
+    cost-cashier-callback-url-post: http://10.0.11.124/purchase/other/cost/check/CashierCallbackUrl
     # oa
     buy-user-api: http://oa.bailuntec.com/Api/User/GetUser
     login-user-api: http://oa.bailuntec.com/Login/GetUserByBLUserAcct

bailuntec-cost-core/src/test/java/com/blt/other/common/util/JwtUtilTest.java

@@ -25,4 +25,9 @@ class JwtUtilTest {
             log.error(ex.getMessage());
         }
     }
+
+    @Test
+    void test() {
+
+    }
 }