Skip to content

I
isc-funds
Commit 4e24d99c by huangshunlin
Options

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

parent c5ceeae2
Showing with 29 additions and 34 deletions
isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtssb/resource/FxtssbResource.java
...@@ -52,19 +52,17 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo> ...@@ -52,19 +52,17 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
* @return * @return
*/ */
@PostMapping("/getRef") @PostMapping("/getRef")
public ResponseSet<String> getRef(@RequestBody FxtssbStoreVo fxtssbStoreVo) { public ResponseSet<String> getRef(@RequestBody FxtssbStoreBo bo) {
FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo); String ref = fxtssbTransactionService.getRef(bo);
String ref = fxtssbTransactionService.getRef(fxtssbStoreBo);
return ResponseSet.simpleSuccess(ref); return ResponseSet.simpleSuccess(ref);
} }
@PostMapping("/defaultAccountsN1000") @PostMapping("/defaultAccountsN1000")
public ResponseSet defaultAccountsN1000(@RequestBody FxtssbStoreVo fxtssbStoreVo) { public ResponseSet defaultAccountsN1000(@RequestBody FxtssbStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSB","",""); settleContext.loadSettleSession("FXTSSB", "", "");
FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo); Map<String, List<String>> codeSet = fxtssbTransactionService.defaultAccountsN1000(bo);
Map<String, List<String>> codeSet = fxtssbTransactionService.defaultAccountsN1000(fxtssbStoreBo); ResponseSet success = ResponseSet.simpleSuccess(bo);
ResponseSet success = ResponseSet.simpleSuccess(fxtssbStoreVo);
success.setCodeSet(codeSet); success.setCodeSet(codeSet);
return success; return success;
} catch (Exception e) { } catch (Exception e) {
...@@ -75,12 +73,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo> ...@@ -75,12 +73,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
} }
@PostMapping("/defaultRateN1000") @PostMapping("/defaultRateN1000")
public ResponseSet defaultRateN1000(@RequestBody FxtssbStoreVo fxtssbStoreVo) { public ResponseSet defaultRateN1000(@RequestBody FxtssbStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSB","",""); settleContext.loadSettleSession("FXTSSB", "", "");
FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo); fxtssbTransactionService.defaultRateN1000(bo);
fxtssbTransactionService.defaultRateN1000(fxtssbStoreBo); return ResponseSet.simpleSuccess(bo);
return ResponseSet.simpleSuccess(fxtssbStoreVo);
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} finally { } finally {
...@@ -90,12 +87,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo> ...@@ -90,12 +87,11 @@ public class FxtssbResource extends AbstractTransactionController<FxtssbStoreVo>
} }
@PostMapping("/defaultCalculateN1100") @PostMapping("/defaultCalculateN1100")
public ResponseSet defaultCalculateN1100(@RequestBody FxtssbStoreVo fxtssbStoreVo) { public ResponseSet defaultCalculateN1100(@RequestBody FxtssbStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSB","",""); settleContext.loadSettleSession("FXTSSB", "", "");
FxtssbStoreBo fxtssbStoreBo = fxtssbStructMapper.voTransferToBo(fxtssbStoreVo); fxtssbTransactionService.defaultCalculateN1100(bo);
fxtssbTransactionService.defaultCalculateN1100(fxtssbStoreBo); return ResponseSet.simpleSuccess(bo);
return ResponseSet.simpleSuccess(fxtssbStoreVo);
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} finally { } 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 ...@@ -155,6 +155,8 @@ public class FxtssbTransactionServiceImpl extends AbstractTransactionService<Fxt
bizInfoVo.setTrdout(rec.getTrdout()); bizInfoVo.setTrdout(rec.getTrdout());
bizInfoVo.setTrnman(rec.getTrnman()); bizInfoVo.setTrnman(rec.getTrnman());
bizInfoVo.setRat(rec.getRat()); bizInfoVo.setRat(rec.getRat());
bizInfoVo.setDfkhlb(rec.getTrnman());
bizInfoVo.setWaitjm(rec.getTrdint());
return bizInfoVo; 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> ...@@ -51,19 +51,17 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
* @return * @return
*/ */
@PostMapping("/getRef") @PostMapping("/getRef")
public ResponseSet<String> getRef(@RequestBody FxtsssStoreVo fxtsssStoreVo) { public ResponseSet<String> getRef(@RequestBody FxtsssStoreBo bo) {
FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo); String ref = fxtsssTransactionService.getRef(bo);
String ref = fxtsssTransactionService.getRef(fxtsssStoreBo);
return ResponseSet.simpleSuccess(ref); return ResponseSet.simpleSuccess(ref);
} }
@PostMapping("/defaultAccountsN1000") @PostMapping("/defaultAccountsN1000")
public ResponseSet defaultAccountsN1000(@RequestBody FxtsssStoreVo fxtsssStoreVo) { public ResponseSet defaultAccountsN1000(@RequestBody FxtsssStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSS", "", ""); settleContext.loadSettleSession("FXTSSS", "", "");
FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo); Map<String, List<String>> codeSet = fxtsssTransactionService.defaultAccountsN1000(bo);
Map<String, List<String>> codeSet = fxtsssTransactionService.defaultAccountsN1000(fxtsssStoreBo); ResponseSet success = ResponseSet.simpleSuccess(bo);
ResponseSet success = ResponseSet.simpleSuccess(fxtsssStoreVo);
success.setCodeSet(codeSet); success.setCodeSet(codeSet);
return success; return success;
} catch (Exception e) { } catch (Exception e) {
...@@ -74,12 +72,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo> ...@@ -74,12 +72,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
} }
@PostMapping("/defaultRateN1000") @PostMapping("/defaultRateN1000")
public ResponseSet defaultRateN1000(@RequestBody FxtsssStoreVo fxtsssStoreVo) { public ResponseSet defaultRateN1000(@RequestBody FxtsssStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSS", "", ""); settleContext.loadSettleSession("FXTSSS", "", "");
FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo); fxtsssTransactionService.defaultRateN1000(bo);
fxtsssTransactionService.defaultRateN1000(fxtsssStoreBo); return ResponseSet.simpleSuccess(bo);
return ResponseSet.simpleSuccess(fxtsssStoreVo);
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} finally { } finally {
...@@ -89,12 +86,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo> ...@@ -89,12 +86,11 @@ public class FxtsssResource extends AbstractTransactionController<FxtsssStoreVo>
} }
@PostMapping("/defaultCalculateN1100") @PostMapping("/defaultCalculateN1100")
public ResponseSet defaultCalculateN1100(@RequestBody FxtsssStoreVo fxtsssStoreVo) { public ResponseSet defaultCalculateN1100(@RequestBody FxtsssStoreBo bo) {
try { try {
settleContext.loadSettleSession("FXTSSS", "", ""); settleContext.loadSettleSession("FXTSSS", "", "");
FxtsssStoreBo fxtsssStoreBo = fxtsssStructMapper.voTransferToBo(fxtsssStoreVo); fxtsssTransactionService.defaultCalculateN1100(bo);
fxtsssTransactionService.defaultCalculateN1100(fxtsssStoreBo); return ResponseSet.simpleSuccess(bo);
return ResponseSet.simpleSuccess(fxtsssStoreVo);
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} finally { } 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; ...@@ -24,7 +24,6 @@ import com.brilliance.isc.common.vo.BizAmdInfoVo;
import com.brilliance.isc.common.vo.BizInfoVo; import com.brilliance.isc.common.vo.BizInfoVo;
import com.brilliance.isc.common.vo.PtsptaVo; 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.bo.funds.FxtsssStoreBo;
import com.brilliance.isc.funds.common.component.FxToolComponent; import com.brilliance.isc.funds.common.component.FxToolComponent;
import com.brilliance.isc.funds.fxtlop.service.FxtpService; import com.brilliance.isc.funds.fxtlop.service.FxtpService;
import com.brilliance.isc.funds.fxtsss.check.FxtsssValidator; import com.brilliance.isc.funds.fxtsss.check.FxtsssValidator;
...@@ -164,6 +163,8 @@ public class FxtsssTransactionServiceImpl extends AbstractTransactionService<Fxt ...@@ -164,6 +163,8 @@ public class FxtsssTransactionServiceImpl extends AbstractTransactionService<Fxt
bizInfoVo.setTrdout(rec.getTrdout()); bizInfoVo.setTrdout(rec.getTrdout());
bizInfoVo.setTrnman(rec.getTrnman()); bizInfoVo.setTrnman(rec.getTrnman());
bizInfoVo.setRat(rec.getRat()); bizInfoVo.setRat(rec.getRat());
bizInfoVo.setDfkhlb(rec.getTrnman());
bizInfoVo.setWaitjm(rec.getTrdout());
return bizInfoVo; return bizInfoVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment