修改FxdBizInfo.java

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxdBizInfoVo.java

@@ -48,4 +48,8 @@ public class FxdBizInfoVo extends BizInfoVo {
     private String trdout = NULLSTR;
 
     private String swtflg = NULLSTR;
+
+    private String cancur = NULLSTR;
+    private BigDecimal canamt = BigDecimal.ZERO;
+
 }

isc-common-service/src/main/java/com/brilliance/isc/common/component/PtsptaToolComponent.java

@@ -62,7 +62,7 @@ public class PtsptaToolComponent {
     private PtsptaMapper ptsptaMapper;
 
     public boolean IsDemestic(PtsptaVo ptsptaVo){
-        if ("CN".equals(ptsptaVo.getAdr().getLoccty())) {
+        if (ptsptaVo.getAdr() !=null && "CN".equals(ptsptaVo.getAdr().getLoccty())) {
             return true;
         } else{
             return false;

isc-common-service/src/main/java/com/brilliance/isc/common/setmod/service/SetmodService.java

@@ -40,6 +40,8 @@ public interface SetmodService {
 
     String getGllRol(String argrol);
 
+    void setglgAllValDat ( SetmodVo setmodVo, Date argValdat , String argFlag   );
+
     //获取币种的节假日，目前前端组件已实现,后端使用isHoliday方法
     @Deprecated
     String getCurCal(String inCur);