请求相关接口添加前置拦截；修复核销金额日志异常

src/main/java/com/qs/serve/common/util/HttpUtil.java

@@ -115,6 +115,10 @@ public class HttpUtil {
 
     public static R<String> doGetResult(String url,HashMap<String,String> headers){
         String result = HttpUtil.doGet(url,headers);
+        log.debug("url:{},result:{}",url,result);
+        if(result==null){
+            Assert.throwEx("远程服务连接失败");
+        }
         JSONObject jsonObject = JSONObject.parseObject(result);
         Integer status = jsonObject.getInteger("status");
         String msg = jsonObject.getString("msg");

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java

@@ -21,6 +21,8 @@ public interface SeeYonService {
 
     R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode);
 
+    boolean testConnection();
+
     /**
      * 通用的创建流程接口
      * @param createProcessBo

src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java

@@ -67,6 +67,16 @@ public class SeeYonServiceImpl implements SeeYonService {
         return result;
     }
 
+    @Override
+    public boolean testConnection() {
+        R result =  syBaseService.getBase(TbsSeeYonConst.API_TEST,"测试连接");
+        if(result!=null&&result.getStatus().equals(200)){
+            return true;
+        }else {
+            return false;
+        }
+    }
+
     @Override
     public R<String> baseCreateProcess(BaseCreateProcessBo createProcessBo) {
         String title = "创建流程";

src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@@ -17,6 +17,7 @@ public interface TbsSeeYonConst {
     String COST_APPLY_TMP_ID = "3018014149748736162";
     String VERIFICATION_TMP_ID = "8370474123848467567";
 
+    String API_TEST = "/testConnection";
     String API_PROCESS_CREATE = "/process/create";
     String API_PROCESS_CREATE_CALLBACK = "/process/createCallback";
     String API_PROCESS_COMMIT = "/process/commit";

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -375,6 +375,7 @@ public class TbsCostApplyController {
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
+        seeYonService.testConnection();
         TbsCostApply costApply = tbsCostApplyService.getById(affairCommit.getCostApplyId());
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){
             return R.error("费用申请处于未非审批状态!");

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -56,6 +56,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void commitApply(String id) {
+        seeYonService.testConnection();
         TbsCostApply tbsCostApply = this.getById(id);
         if(!tbsCostApply.getChargeState().equals(TbsCostApplyState.State_0_unPublish.getCode())
                 &&!tbsCostApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -167,6 +167,7 @@ public class VtbVerificationController {
     @SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('vtb:verification:commit')")
     public R<?> commit(@RequestBody @Valid VtbVerificationBo param){
+        seeYonService.testConnection();
         vtbVerificationService.commit(param);
         return R.ok();
     }
@@ -231,6 +232,7 @@ public class VtbVerificationController {
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
+        seeYonService.testConnection();
         return verificationApplication.commitAffair(affairCommit);
     }
 

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -150,34 +150,32 @@ public class VtbVerificationApplication {
                 BigDecimal lastAmount = currVs.getUsedAmount();
                 yardItem.setLastAmount(lastAmount);
 
-                yardItem.setLastSession(currVs.getCountSession());
-                yardItem.setCurrSession(currVs.getCountSession());
-                if(countSession != null){
                 Integer lastSession = currVs.getCountSession();
-                    if(!countSession.equals(lastSession)){
                 yardItem.setLastSession(lastSession);
+                yardItem.setCurrSession(lastSession);
+                if(countSession != null){
                     yardItem.setCurrSession(countSession);
+                    if(!countSession.equals(lastSession)){
                         VtbVerificationSubject verSub4Upd = new VtbVerificationSubject();
                         verSub4Upd.setId(currVs.getId());
-                        verSub4Upd.setCountPerson(countSession);
+                        verSub4Upd.setCountSession(countSession);
                         verSubject4Update.add(verSub4Upd);
                         if(lastSession!=null){
                             if(lastSession > countSession){
-                                yardItem.setRemark2("减少场次："+ (currVs.getCountSession() - countSession));
+                                yardItem.setRemark2("减少场次："+ (lastSession - countSession));
                             }else {
-                                yardItem.setRemark2("增加场次："+ (countSession - currVs.getCountSession()));
+                                yardItem.setRemark2("增加场次："+ (countSession - lastSession));
                             }
                         }
                     }
                 }
 
-                yardItem.setLastSession(currVs.getCountSession());
-                yardItem.setCurrSession(currVs.getCountSession());
-                if( countPerson != null ){
                 Integer lastPerson = currVs.getCountPerson();
-                    if(!countPerson.equals(lastPerson)){
                 yardItem.setLastPerson(lastPerson);
+                yardItem.setCurrPerson(lastPerson);
+                if( countPerson != null ){
                     yardItem.setCurrPerson(countPerson);
+                    if(!countPerson.equals(lastPerson)){
                         VtbVerificationSubject verSub4Upd = new VtbVerificationSubject();
                         verSub4Upd.setId(currVs.getId());
                         verSub4Upd.setCountPerson(countPerson);