即期结售汇查询

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtsel/service/FxtselService.java

@@ -23,5 +23,5 @@ public interface FxtselService {
 
      Object selectXxdByPrimaryKey(Map<String, String> map);
 
-     Object jshDealWithByInr(TrnCodeQueryVo trnCodeQueryVo);
+     Object jshDealWithByInr(String inr);
 }

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtsel/service/impl/FxtselServiceImpl.java

@@ -12,10 +12,10 @@ import com.brilliance.isc.vo.TrnCodeQueryVo;
 import com.brilliance.isc.vo.TrncodVo;
 import com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo;
 import com.brilliance.isc.vo.funds.FxtselQueryVo;
+import com.brilliance.mda.runtime.mda.util.Strings;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,17 +91,15 @@ public class FxtselServiceImpl implements FxtselService {
 
     @Override
     public List<TrncodVo> dealWithByInr(TrnCodeQueryVo trnCodeQueryVo) {
-        String type = StringUtils.trimToEmpty(trnCodeQueryVo.getType());
+        String type = Strings.toUpper(trnCodeQueryVo.getType());
+        String inr = trnCodeQueryVo.getInr();
         if ("JSH".equals(type)) {
             //结售汇页签
-            return jshDealWithByInr(trnCodeQueryVo);
+            return jshDealWithByInr(inr);
         }
         List<TrncodVo> result = Lists.newArrayList();
-        Fxdgrp fxdgrp = new Fxdgrp();
-        fxdgrp = fxToolComponent.getFxdgrpByInr(trnCodeQueryVo.getInr());
-
-
-        if ("dhpp".equals(type.toLowerCase())) {
+        Fxdgrp fxdgrp = fxToolComponent.getFxdgrpByInr(inr);
+        if ("DHPP".equals(type)) {
             String[] fxTraArray = {"FXTFCM", "FXTFCN"};
             String[] fxButArray = {"外币兑换平盘确认", "外币兑换平盘销账"};
             String isAllowed = "";
@@ -110,7 +108,7 @@ public class FxtselServiceImpl implements FxtselService {
                 fxToolComponent.isFXTrnAllowed(fxdgrp, trncodVo);
                 result.add(trncodVo);
             }
-        } else if ("jshpp".equals(type.toLowerCase())) {
+        } else if ("JSHPP".equals(type)) {
             String[] fxTraArray = {"FXTLCM", "FXTLCN"};
             String[] fxButArray = {"结售汇平盘确认", "结售汇平盘销账"};
             String isAllowed = "";
@@ -119,20 +117,7 @@ public class FxtselServiceImpl implements FxtselService {
                 fxToolComponent.isFXTrnAllowed(fxdgrp, trncodVo);
                 result.add(trncodVo);
             }
-        } else if ("jsh".equals(type.toLowerCase())) {
-            String[] fxTraArray = {"FXTSQO"};
-            String[] fxButArray = {"结售汇报价"};
-            String isAllowed = "";
-            for (int i = 0; i < fxTraArray.length; i++) {
-                TrncodVo trncodVo = new TrncodVo(fxTraArray[i], fxButArray[i], isAllowed, "Y", "");
-                fxToolComponent.isFXTrnAllowed(fxdgrp, trncodVo);
-                result.add(trncodVo);
-            }
-        } else {
-
         }
-
-
         return result;
     }
 
@@ -155,4 +140,19 @@ public class FxtselServiceImpl implements FxtselService {
 
 
     }
+
+    @Override
+    public List<TrncodVo> jshDealWithByInr(String inr) {
+        List<TrncodVo> result = Lists.newArrayList();
+        Fxdgrp fxdgrp = fxToolComponent.getFxdgrpByInr(inr);
+        String[] fxTraArray = {"FXTSQO"};
+        String[] fxButArray = {"结售汇报价"};
+        String isAllowed = "";
+        for (int i = 0; i < fxTraArray.length; i++) {
+            TrncodVo trncodVo = new TrncodVo(fxTraArray[i], fxButArray[i], isAllowed, "Y", "");
+            fxToolComponent.isFXTrnAllowed2(fxdgrp, trncodVo);
+            result.add(trncodVo);
+        }
+        return result;
+    }
 }