修复无申报选项问题，修复未展示汇率问题

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtssb/resource/FxtssbResource.java

@@ -52,19 +52,17 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
      * @return
      */
     @PostMapping("/getRef")
-    public ResponseSet<String> getRef(@RequestBody FxtssbStoreVo fxtssbStoreVo) {
-        FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo);
-        String ref = fxtssbTransactionService.getRef(fxtssbStoreBo);
+    public ResponseSet<String> getRef(@RequestBody FxtssbStoreBo bo) {
+        String ref = fxtssbTransactionService.getRef(bo);
         return ResponseSet.simpleSuccess(ref);
     }
 
     @PostMapping("/defaultAccountsN1000")
-    public ResponseSet defaultAccountsN1000(@RequestBody FxtssbStoreVo fxtssbStoreVo) {
+    public ResponseSet defaultAccountsN1000(@RequestBody FxtssbStoreBo bo) {
         try {
-            settleContext.loadSettleSession("FXTSSB","","");
-            FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo);
-            Map<String, List<String>> codeSet = fxtssbTransactionService.defaultAccountsN1000(fxtssbStoreBo);
-            ResponseSet success = ResponseSet.simpleSuccess(fxtssbStoreVo);
+            settleContext.loadSettleSession("FXTSSB", "", "");
+            Map<String, List<String>> codeSet = fxtssbTransactionService.defaultAccountsN1000(bo);
+            ResponseSet success = ResponseSet.simpleSuccess(bo);
             success.setCodeSet(codeSet);
             return success;
         } catch (Exception e) {
@@ -75,12 +73,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
     }
 
     @PostMapping("/defaultRateN1000")
-    public ResponseSet defaultRateN1000(@RequestBody FxtssbStoreVo fxtssbStoreVo) {
+    public ResponseSet defaultRateN1000(@RequestBody FxtssbStoreBo bo) {
         try {
-            settleContext.loadSettleSession("FXTSSB","","");
-            FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo);
-            fxtssbTransactionService.defaultRateN1000(fxtssbStoreBo);
-            return ResponseSet.simpleSuccess(fxtssbStoreVo);
+            settleContext.loadSettleSession("FXTSSB", "", "");
+            fxtssbTransactionService.defaultRateN1000(bo);
+            return ResponseSet.simpleSuccess(bo);
         } catch (Exception e) {
             throw e;
         } finally {
@@ -90,12 +87,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
     }
 
     @PostMapping("/defaultCalculateN1100")
-    public ResponseSet defaultCalculateN1100(@RequestBody FxtssbStoreVo fxtssbStoreVo) {
+    public ResponseSet defaultCalculateN1100(@RequestBody FxtssbStoreBo bo) {
         try {
-            settleContext.loadSettleSession("FXTSSB","","");
-            FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo);
-            fxtssbTransactionService.defaultCalculateN1100(fxtssbStoreBo);
-            return ResponseSet.simpleSuccess(fxtssbStoreVo);
+            settleContext.loadSettleSession("FXTSSB", "", "");
+            fxtssbTransactionService.defaultCalculateN1100(bo);
+            return ResponseSet.simpleSuccess(bo);
         } catch (Exception e) {
             throw e;
         } finally {

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtssb/service/FxtssbTransactionServiceImpl.java

@@ -155,6 +155,8 @@ public class FxtssbTransactionServiceImpl extends AbstractTransactionService<Fxt
         bizInfoVo.setTrdout(rec.getTrdout());
         bizInfoVo.setTrnman(rec.getTrnman());
         bizInfoVo.setRat(rec.getRat());
+        bizInfoVo.setDfkhlb(rec.getTrnman());
+        bizInfoVo.setWaitjm(rec.getTrdint());
         return bizInfoVo;
     }
 

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtsss/resource/FxtsssResource.java

@@ -51,19 +51,17 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
      * @return
      */
     @PostMapping("/getRef")
-    public ResponseSet<String> getRef(@RequestBody FxtsssStoreVo fxtsssStoreVo) {
-        FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo);
-        String ref = fxtsssTransactionService.getRef(fxtsssStoreBo);
+    public ResponseSet<String> getRef(@RequestBody FxtsssStoreBo bo) {
+        String ref = fxtsssTransactionService.getRef(bo);
         return ResponseSet.simpleSuccess(ref);
     }
 
     @PostMapping("/defaultAccountsN1000")
-    public ResponseSet defaultAccountsN1000(@RequestBody FxtsssStoreVo fxtsssStoreVo) {
+    public ResponseSet defaultAccountsN1000(@RequestBody FxtsssStoreBo bo) {
         try {
             settleContext.loadSettleSession("FXTSSS", "", "");
-            FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo);
-            Map<String, List<String>> codeSet = fxtsssTransactionService.defaultAccountsN1000(fxtsssStoreBo);
-            ResponseSet success = ResponseSet.simpleSuccess(fxtsssStoreVo);
+            Map<String, List<String>> codeSet = fxtsssTransactionService.defaultAccountsN1000(bo);
+            ResponseSet success = ResponseSet.simpleSuccess(bo);
             success.setCodeSet(codeSet);
             return success;
         } catch (Exception e) {
@@ -74,12 +72,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
     }
 
     @PostMapping("/defaultRateN1000")
-    public ResponseSet defaultRateN1000(@RequestBody FxtsssStoreVo fxtsssStoreVo) {
+    public ResponseSet defaultRateN1000(@RequestBody FxtsssStoreBo bo) {
         try {
             settleContext.loadSettleSession("FXTSSS", "", "");
-            FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo);
-            fxtsssTransactionService.defaultRateN1000(fxtsssStoreBo);
-            return ResponseSet.simpleSuccess(fxtsssStoreVo);
+            fxtsssTransactionService.defaultRateN1000(bo);
+            return ResponseSet.simpleSuccess(bo);
         } catch (Exception e) {
             throw e;
         } finally {
@@ -89,12 +86,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
     }
 
     @PostMapping("/defaultCalculateN1100")
-    public ResponseSet defaultCalculateN1100(@RequestBody FxtsssStoreVo fxtsssStoreVo) {
+    public ResponseSet defaultCalculateN1100(@RequestBody FxtsssStoreBo bo) {
         try {
             settleContext.loadSettleSession("FXTSSS", "", "");
-            FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo);
-            fxtsssTransactionService.defaultCalculateN1100(fxtsssStoreBo);
-            return ResponseSet.simpleSuccess(fxtsssStoreVo);
+            fxtsssTransactionService.defaultCalculateN1100(bo);
+            return ResponseSet.simpleSuccess(bo);
         } catch (Exception e) {
             throw e;
         } finally {

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtsss/service/FxtsssTransactionServiceImpl.java

@@ -24,7 +24,6 @@ import com.brilliance.isc.common.vo.BizAmdInfoVo;
 import com.brilliance.isc.common.vo.BizInfoVo;
 import com.brilliance.isc.common.vo.PtsptaVo;
 import com.brilliance.isc.funds.bo.funds.FxtsssStoreBo;
-import com.brilliance.isc.funds.bo.funds.FxtsssStoreBo;
 import com.brilliance.isc.funds.common.component.FxToolComponent;
 import com.brilliance.isc.funds.fxtlop.service.FxtpService;
 import com.brilliance.isc.funds.fxtsss.check.FxtsssValidator;
@@ -164,6 +163,8 @@ public class FxtsssTransactionServiceImpl extends AbstractTransactionService<Fxt
         bizInfoVo.setTrdout(rec.getTrdout());
         bizInfoVo.setTrnman(rec.getTrnman());
         bizInfoVo.setRat(rec.getRat());
+        bizInfoVo.setDfkhlb(rec.getTrnman());
+        bizInfoVo.setWaitjm(rec.getTrdout());
         return bizInfoVo;
     }