[深爱] 财务对接

pom.xml

@@ -181,11 +181,11 @@
 			<version>RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>sf-sdk</groupId>
 			<artifactId>sf-csim-express</artifactId>
 			<version>2.1.7</version>
-		</dependency>
+		</dependency>-->
 	</dependencies>
 
 	<build>

src/main/java/com/uas/eis/controller/ERPController.java

@@ -20,21 +20,4 @@ public class ERPController {
     @Autowired
     private ERPService erpService;
 
-    /**
-     * 创建顺丰订单
-     */
-    @RequestMapping(value="/erp/creatSFOrder",method=RequestMethod.POST)
-    @ResponseBody
-    public Map<String, Object> creatSFOrder(String master, Integer id,String emCode){
-        return erpService.creatSFOrder(master,id,emCode);
-    }
-
-    /**
-     * 取消顺丰订单
-     */
-    @RequestMapping(value="/erp/cancelSFOrder",method=RequestMethod.POST)
-    @ResponseBody
-    public Map<String, Object> cancelSFOrder(String master, Integer id,String emCode){
-        return erpService.cancelSFOrder(master,id,emCode);
-    }
 }

src/main/java/com/uas/eis/sdk/okhttp/HttpCommand.java

@@ -1,6 +1,6 @@
 package com.uas.eis.sdk.okhttp;
 
-import com.sun.istack.internal.NotNull;
+//import com.sun.istack.internal.NotNull;
 import com.uas.eis.sdk.constant.ClientConstants;
 import com.uas.eis.sdk.core.Config;
 import com.uas.eis.sdk.core.HttpMethod;
@@ -13,6 +13,7 @@ import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;

src/main/java/com/uas/eis/service/ERPService.java

@@ -11,7 +11,5 @@ import java.util.Map;
  * @date 2021-12-06 18:25
  */
 public interface ERPService {
-    Map<String, Object> creatSFOrder(String master, Integer id,String emCode);
 
-    Map<String, Object> cancelSFOrder(String master, Integer id, String emCode);
 }

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -1,9 +1,5 @@
 package com.uas.eis.service.Impl;
 
-import com.sf.csim.express.service.CallExpressServiceTools;
-import com.sf.csim.express.service.HttpClientUtil;
-import com.sf.csim.express.service.IServiceCodeStandard;
-import com.sf.csim.express.service.code.ExpressServiceCodeEnum;
 import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.*;
 import com.uas.eis.entity.sf.*;
@@ -26,354 +22,5 @@ public class ERPServiceImpl implements ERPService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     @Autowired
     private BaseDao baseDao;
-    @Override
-    public Map<String, Object> creatSFOrder(String master, Integer id,String emCode) {
-        Map<String,Object> retMap = new HashMap<>();
-        retMap.put("success",true);
-        logger.info("creatSFOrder-Begin:master {} id {}",master,id);
-        SpObserver.putSp(master);
-        SqlRowList outMsg = baseDao.queryForRowSet(" select pi_inoutno,pi_dockingstatus,pi_title,pi_address,pi_purposename,pi_expresscode,pi_dockingcode " +
-                        " from prodinout where pi_id = ? ",id);
-        if(outMsg.next()){
-            if(outMsg.getGeneralString("pi_dockingstatus").equals("已创建")){
-                retMap.put("success",false);
-                retMap.put("message","出货单已创建顺发订单.");
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-            Object[] obs = baseDao.getFieldsDataByCondition("JYX_ZS.DOCK_SF_CONFIG A "
-                    , new String[]{"CALL_URL","CLIENT_CODE","CHECK_WORD","ENABLE_"}, "username='"+master+"' and A.ENABLE_ = 1");
-            if(!StringUtil.hasText(obs[0])){
-                retMap.put("success",false);
-                retMap.put("message","请联系管理员配置创建URL.");
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-            if(!StringUtil.hasText(obs[1])){
-                retMap.put("success",false);
-                retMap.put("message","请联系管理员配置丰桥平台顾客编码.");
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-            if(!StringUtil.hasText(obs[2])){
-                retMap.put("success",false);
-                retMap.put("message","请联系管理员配置丰桥平台校验码.");
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-            boolean prodFlag = (Integer.valueOf(obs[3].toString())!=0);
-            Object emName = baseDao.getFieldDataByCondition("employee" , "em_name", "em_code='"+emCode+"'");
-            if(emName == null){
-                emName = "管理员("+emCode+")";
-            }
-            String inoutNo = outMsg.getGeneralString("pi_inoutno");
-            String orderCode = outMsg.getGeneralString("pi_dockingcode");
-            if(orderCode.length()>0){
-                orderCode=inoutNo+"-"+(Integer.valueOf(orderCode.split("-")[1])+1);
-            }else {
-                orderCode=inoutNo+"-1";
-            }
-            String CLIENT_CODE = obs[1].toString();  //此处替换为您在丰桥平台获取的顾客编码
-            //沙箱环境的地址 -PRO https://sfapi-sbox.sf-express.com/std/service
-            //生产环境的地址 -PRO https://sfapi.sf-express.com/std/service
-            String CALL_URL = obs[0].toString();
-            //此处替换为您在丰桥平台获取的校验码 生产环境 "GgO0UoyQ5FssNLItii3olo63bQ80ErAE" 沙箱环境 "rMBhSYRa9OtUPkfX5mow01NlxDWtI411"
-            String CHECK_WORD = obs[2].toString();
-            String monthlyCard = "7551234567";
-            if(prodFlag){
-                monthlyCard = baseDao.getDBSetting("ProdInOut!Sale","monthlyCard");
-            }
-            //寄件人
-            Object[] en = baseDao.getFieldsDataByCondition("enterprise" , new String[]{"EN_NAME","EN_DELIVERADDR"}, "1=1");
-            String sendCop = en[0].toString().trim();
-            String sendAddr = en[1].toString();
-            String sendMan = baseDao.getDBSetting("ProdInOut!Sale","sendMan");
-            String sendMobile = baseDao.getDBSetting("ProdInOut!Sale","sendMobile");
 
-            IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CREATE_ORDER; //下订单
-            CallExpressServiceTools tools=CallExpressServiceTools.getInstance();
-            Map<String, String> params = new HashMap<String, String>();
-            String timeStamp = String.valueOf(System.currentTimeMillis());
-            String msgData = "";
-            SFCreatOrderReq sfOrder = new SFCreatOrderReq();
-            sfOrder.setOrderId(orderCode);
-            sfOrder.setMonthlyCard(monthlyCard);
-            sfOrder.setIsSignBack(1);
-            //寄件方信息
-            List<SFContactInfo> contactInfoList = new ArrayList<>();
-            SFContactInfo sendInfo = new SFContactInfo();
-            sendInfo.setContactType(1);
-            sendInfo.setCompany(sendCop);
-            sendInfo.setContact(sendMan);
-            sendInfo.setMobile(sendMobile);
-            sendInfo.setAddress(sendAddr);
-            contactInfoList.add(sendInfo);
-            //到件方信息
-            SFContactInfo receiveInfo = new SFContactInfo();
-            receiveInfo.setContactType(2);
-            receiveInfo.setCompany(outMsg.getGeneralString("pi_title"));
-            receiveInfo.setContact(outMsg.getGeneralString("pi_purposename"));
-            receiveInfo.setMobile(outMsg.getGeneralString("pi_expresscode"));
-            receiveInfo.setAddress(outMsg.getGeneralString("pi_address"));
-            contactInfoList.add(receiveInfo);
-            sfOrder.setContactInfoList(contactInfoList);
-            List<SFCargoDetail> cargoDetails = new ArrayList<>();
-            /*SqlRowList outList = baseDao.queryForRowSet(" select pr_detail,pr_unit,sum(pd_outqty) outqty from prodiodetail left join product on pr_code = pd_prodcode where pd_piid = ? and pr_detail is not null group by pr_detail,pr_unit",id);
-            while (outList.next()){
-                SFCargoDetail cargoDetail = new SFCargoDetail();
-                cargoDetail.setName(outList.getGeneralString("pr_detail"));
-                cargoDetail.setUnit(outList.getGeneralString("pr_unit"));
-                cargoDetail.setCount(outList.getGeneralDouble("outqty"));
-                cargoDetails.add(cargoDetail);
-            }*/
-            sfOrder.setCargoDetails(cargoDetails);
-            msgData = FlexJsonUtil.toJsonDeep(sfOrder);
-//            System.out.println("====请求msgData：" + msgData);
-            try {
-                params.put("partnerID", CLIENT_CODE);  // 顾客编码 ，对应丰桥上获取的clientCode
-                params.put("requestID", UUID.randomUUID().toString().replace("-", ""));
-                params.put("serviceCode",standardService.getCode());// 接口服务码
-                params.put("timestamp", timeStamp);
-                params.put("msgData", msgData);
-                params.put("msgDigest", tools.getMsgDigest(msgData,timeStamp,CHECK_WORD));
-                long startTime = System.currentTimeMillis();
-//                System.out.println("====调用实际请求：" + params);
-                String result = HttpClientUtil.post(CALL_URL, params);
-//                System.out.println("====调用丰桥的接口服务代码：" + String.valueOf(standardService.getCode()) + " 接口耗时："+ String.valueOf(System.currentTimeMillis()-startTime)+"====");
-//                System.out.println("===调用地址 ==="+CALL_URL);
-//                System.out.println("===顾客编码 ==="+CLIENT_CODE);
-//                System.out.println("===返回结果：" +result);
-                SFApiResp sfApiResp = FlexJsonUtil.fromJson(result, SFApiResp.class);
-                if(sfApiResp!=null){
-                    if("A1000".equals(sfApiResp.getApiResultCode())){
-                        String apiResultData = sfApiResp.getApiResultData();
-                        SFCreatOrderResp sfApiRespData =  FlexJsonUtil.fromJson(apiResultData, SFCreatOrderResp.class);
-                        if(sfApiRespData.isSuccess()){
-                            SFCreateOrder sfOrderResp =  sfApiRespData.getMsgData();
-                            StringBuffer waybillNoList = new StringBuffer();
-                            StringBuffer waybillNoP = new StringBuffer();
-                            StringBuffer waybillSon = new StringBuffer();
-                            StringBuffer waybillBack = new StringBuffer();
-                            if(!CollectionUtil.isEmpty(sfOrderResp.getWaybillNoInfoList())){
-                                for (SFWaybillNoInfo sfWaybillNoInfoResp:sfOrderResp.getWaybillNoInfoList()){
-//                                    System.out.println("顺丰物流单号： ====="+sfWaybillNoInfoResp.getWaybillNo());
-                                    String waybillNo = sfWaybillNoInfoResp.getWaybillNo();
-                                    if(sfWaybillNoInfoResp.getWaybillType() == 1||sfWaybillNoInfoResp.getWaybillType() == 2){//运单号类型1：母单 2 :子单 3 : 签回单
-                                        if(waybillNoList.length()>0){
-                                            waybillNoList.append(",");
-                                        }
-                                        waybillNoList.append(waybillNo);
-                                        if(sfWaybillNoInfoResp.getWaybillType() == 1) {
-                                            if (waybillNoP.length() > 0) {
-                                                waybillNoP.append(",");
-                                            }
-                                            waybillNoP.append(waybillNo);
-                                        }else{
-                                            if (waybillSon.length() > 0) {
-                                                waybillSon.append(",");
-                                            }
-                                            waybillSon.append(waybillNo);
-                                        }
-                                    }else {
-                                        if(waybillBack.length()>0){
-                                            waybillBack.append(",");
-                                        }
-                                        waybillBack.append(waybillNo);
-                                    }
-                                }
-                            }
-                            if(waybillNoList.length()>0){
-                                baseDao.execute("update prodinout set pi_dockingcode=?,pi_logisticscode = ?,pi_dockingstatus='已创建'" +
-                                                ",pi_sfParentCode=?,pi_sfSonCode=?,pi_sfBackCode=?" +
-                                                ",pi_sf_filterresult=?,pi_sf_remark=? where pi_id = ?"
-                                        ,orderCode,waybillNoList.toString(),waybillNoP.toString(),waybillSon.toString(),waybillBack.toString()
-                                        ,sfOrderResp.getFilterResult(),sfOrderResp.getRemark()
-                                        ,id);
-                                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单'" +
-                                        ",'创建成功，顺发单号:"+orderCode+",物流单号:"+waybillNoList.toString()+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                            } else {
-                                retMap.put("message","创建失败:["+sfApiRespData.getErrorCode()+"]"+sfApiRespData.getErrorMsg());
-                                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                                retMap.put("success",false);
-                                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                                return retMap;
-                            }
-                        }else {
-                            retMap.put("message","创建失败:["+sfApiRespData.getErrorCode()+"]"+sfApiRespData.getErrorMsg());
-                            baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                    "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                            retMap.put("success",false);
-                            logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                            return retMap;
-                        }
-                    }else {
-//                        System.out.println("code:"+sfApiResp.getApiResultCode()+"===apiResponseID:"+sfApiResp.getApiResponseID()+"===apiErrorMsg:"+sfApiResp.getApiErrorMsg());
-                        retMap.put("message","创建失败:["+sfApiResp.getApiResultCode()+"]"+sfApiResp.getApiErrorMsg());
-                        baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                        retMap.put("success",false);
-                        logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                        return retMap;
-                    }
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单','创建失败:"+(StringUtil.nvl(e.getMessage(),""))+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                retMap.put("success",false);
-                retMap.put("message","创建失败"+(StringUtil.nvl(e.getMessage(),"")));
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-        }else {
-            retMap.put("success",false);
-            retMap.put("message","没有需要创建的出货单.");
-            logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-            return retMap;
-        }
-        logger.info("creatSFOrder-End:master {} id {}",master,id);
-        retMap.put("message","创建成功。");
-        return retMap;
-    }
-
-    @Override
-    public Map<String, Object> cancelSFOrder(String master, Integer id, String emCode) {
-        Map<String,Object> retMap = new HashMap<>();
-        retMap.put("success",true);
-        logger.info("cancelSFOrder-Begin:master {} id {}",master,id);
-        SpObserver.putSp(master);
-        SqlRowList outMsg = baseDao.queryForRowSet(" select pi_inoutno,pi_dockingstatus,pi_dockingcode from prodinout where pi_id = ? ",id);
-        if(outMsg.next()) {
-            if (!outMsg.getGeneralString("pi_dockingstatus").equals("已创建")) {
-                retMap.put("success", false);
-                retMap.put("message", "出货单尚未创建顺发订单.");
-                logger.info("cancelSFOrder-F:master {} id {} err {}", master, id, retMap.get("message"));
-                return retMap;
-            }
-            Object[] obs = baseDao.getFieldsDataByCondition("JYX_ZS.DOCK_SF_CONFIG A "
-                    , new String[]{"CALL_URL", "CLIENT_CODE", "CHECK_WORD", "ENABLE_"}, "username='" + master + "' and A.ENABLE_ = 1");
-            if (!StringUtil.hasText(obs[0])) {
-                retMap.put("success", false);
-                retMap.put("message", "请联系管理员配置创建URL.");
-                logger.info("cancelSFOrder-F:master {} id {} err {}", master, id, retMap.get("message"));
-                return retMap;
-            }
-            if (!StringUtil.hasText(obs[1])) {
-                retMap.put("success", false);
-                retMap.put("message", "请联系管理员配置丰桥平台顾客编码.");
-                logger.info("cancelSFOrder-F:master {} id {} err {}", master, id, retMap.get("message"));
-                return retMap;
-            }
-            if (!StringUtil.hasText(obs[2])) {
-                retMap.put("success", false);
-                retMap.put("message", "请联系管理员配置丰桥平台校验码.");
-                logger.info("cancelSFOrder-F:master {} id {} err {}", master, id, retMap.get("message"));
-                return retMap;
-            }
-            Object emName = baseDao.getFieldDataByCondition("employee" , "em_name", "em_code='"+emCode+"'");
-            if(emName == null){
-                emName = "管理员("+emCode+")";
-            }
-            String inoutNo = outMsg.getGeneralString("pi_inoutno");
-            String orderCode = outMsg.getGeneralString("pi_dockingcode");
-            String CLIENT_CODE = obs[1].toString();  //丰桥平台获取的顾客编码
-            String CALL_URL = obs[0].toString(); //沙箱环境的地址 -PRO https://sfapi-sbox.sf-express.com/std/service 生产环境的地址 -PRO https://sfapi.sf-express.com/std/service
-            String CHECK_WORD = obs[2].toString(); //丰桥平台获取的校验码 生产环境 "GgO0UoyQ5FssNLItii3olo63bQ80ErAE" 沙箱环境 "rMBhSYRa9OtUPkfX5mow01NlxDWtI411"
-
-            IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_UPDATE_ORDER;//订单取消
-            CallExpressServiceTools tools=CallExpressServiceTools.getInstance();
-            Map<String, String> params = new HashMap<String, String>();
-            String timeStamp = String.valueOf(System.currentTimeMillis());
-            String msgData = "";
-            Map<String,Object> msgDataMap = new HashMap<>();
-            msgDataMap.put("orderId",orderCode);
-            msgDataMap.put("dealType",2);
-            msgData = FlexJsonUtil.toJsonDeep(msgDataMap);
-            try {
-                params.put("partnerID", CLIENT_CODE);  // 顾客编码 ，对应丰桥上获取的clientCode
-                params.put("requestID", UUID.randomUUID().toString().replace("-", ""));
-                params.put("serviceCode",standardService.getCode());// 接口服务码
-                params.put("timestamp", timeStamp);
-                params.put("msgData", msgData);
-                params.put("msgDigest", tools.getMsgDigest(msgData,timeStamp,CHECK_WORD));
-                long startTime = System.currentTimeMillis();
-//		System.out.println("====调用请求：" + params.get("msgData"));
-//                System.out.println("====调用实际请求：" + params);
-                String result = HttpClientUtil.post(CALL_URL, params);
-//                System.out.println("====调用丰桥的接口服务代码：" + String.valueOf(standardService.getCode()) + " 接口耗时："+ String.valueOf(System.currentTimeMillis()-startTime)+"====");
-//                System.out.println("===调用地址 ==="+CALL_URL);
-//                System.out.println("===顾客编码 ==="+CLIENT_CODE);
-//                System.out.println("===返回结果：" +result);
-//		Map<String,Object> resData = JacksonUtil.fromJson(result);
-                SFApiResp sfApiResp = FlexJsonUtil.fromJson(result, SFApiResp.class);
-                if(sfApiResp!=null){
-                    if("A1000".equals(sfApiResp.getApiResultCode())){
-                        String apiResultData = sfApiResp.getApiResultData();
-                        SFCancelOrderResp sfApiRespData =  FlexJsonUtil.fromJson(apiResultData, SFCancelOrderResp.class);
-                        if(sfApiRespData.isSuccess()){
-                            SFCancelOrder sfOrderResp =  sfApiRespData.getMsgData();
-                            StringBuffer waybillNo = new StringBuffer();
-                            if(!CollectionUtil.isEmpty(sfOrderResp.getWaybillNoInfoList())){
-                                for (SFWaybillNoInfo sfWaybillNoInfoResp:sfOrderResp.getWaybillNoInfoList()){
-//                                    System.out.println("顺丰物流单号： ====="+sfWaybillNoInfoResp.getWaybillNo());
-                                    if(waybillNo.length()>0){
-                                        waybillNo.append(",");
-                                    }
-                                    waybillNo.append(sfWaybillNoInfoResp.getWaybillNo());
-                                }
-                            }
-                            if(sfOrderResp.getResStatus()==2){
-                                baseDao.execute("update prodinout set pi_logisticscode = null,pi_dockingstatus=null,pi_sfParentCode=null,pi_sfSonCode=null,pi_sfBackCode=null,pi_sf_filterresult=null,pi_sf_remark=null where pi_id = ?",id);
-                                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','取消顺发订单','取消成功"+(waybillNo.length()>0?"，物流单号: "+waybillNo.toString():"")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                            }else {
-                                if(sfOrderResp.getResStatus()==1){
-                                    retMap.put("message","取消失败:客户订单号与顺丰运单不匹配");
-                                }else {
-                                    retMap.put("message","取消失败:["+sfOrderResp.getResStatus()+"]");
-                                }
-                                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','取消顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                                retMap.put("success",false);
-                                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                                return retMap;
-                            }
-                        }else {
-                            baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                    "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','取消顺发订单','取消失败:["+sfApiRespData.getErrorCode()+"]"+sfApiRespData.getErrorMsg()+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                            retMap.put("success",false);
-                            retMap.put("message","取消失败:["+sfApiRespData.getErrorCode()+"]"+sfApiRespData.getErrorMsg());
-                            logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                            return retMap;
-                        }
-                    }else {
-                        retMap.put("message","创建失败:["+sfApiResp.getApiResultCode()+"]"+sfApiResp.getApiErrorMsg());
-                        baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                                "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','创建顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                        retMap.put("success",false);
-                        logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                        return retMap;
-                    }
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-                retMap.put("message","取消失败"+(StringUtil.nvl(e.getMessage(),"")));
-                baseDao.execute("INSERT INTO MESSAGELOG(ML_ID, ML_DATE, ML_MAN, ML_CONTENT, ML_RESULT, ML_SEARCH, CODE) " +
-                        "values( MESSAGELOG_SEQ.nextval,SYSDATE,'"+emName+"','取消顺发订单','"+retMap.get("message")+"','ProdInOut!Sale|pi_id="+id+"','"+inoutNo+"')");
-                retMap.put("success",false);
-                logger.info("creatSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-                return retMap;
-            }
-        }else {
-            retMap.put("success",false);
-            retMap.put("message","没有需要操作的出货单.");
-            logger.info("cancelSFOrder-F:master {} id {} err {}",master,id,retMap.get("message"));
-            return retMap;
-        }
-        logger.info("cancelSFOrder-End:master {} id {}",master,id);
-        retMap.put("message","取消成功。");
-        return retMap;
-    }
 }

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: JYX_ZS
+        username: SZSI_P
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1
@@ -22,7 +22,7 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /eis_sf
+        /eis_cw
     port: 8186
 
 action:

src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: JYX_ZS
+        username: SZSI_P
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1
@@ -22,7 +22,7 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /eis_sf
+        /eis_cw
     port: 8186
 
 action:

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,25 +1,15 @@
 package com.uas.eis;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dao.*;
-import com.uas.eis.entity.sf.*;
-import com.uas.eis.service.ERPService;
-import com.uas.eis.utils.*;
+import com.uas.eis.sdk.entity.ApiResult;
+import com.uas.eis.service.STKService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import com.sf.csim.express.service.CallExpressServiceTools;
-import com.sf.csim.express.service.HttpClientUtil;
-import com.sf.csim.express.service.IServiceCodeStandard;
-import com.sf.csim.express.service.code.ExpressServiceCodeEnum;
-
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.*;
 
 @RunWith(SpringRunner.class)
@@ -28,287 +18,11 @@ public class UasEisApplicationTests {
 	@Autowired
 	private BaseDao baseDao;
 	@Autowired
-	private ERPService erpService;
-	/**
-	 丰桥新沙箱测试顾客编码  Yg4Zf06w_sxZs3A5D
-	 校验码  3Xdk1jqeG1Xod9nUXus8Op7DNOkchTnw
-	 **/
-	private static final String CLIENT_CODE = "JYXKJWFFJ88E";  //此处替换为您在丰桥平台获取的顾客编码
-	//此处替换为您在丰桥平台获取的校验码
-	private static final String CHECK_WORD_PROD = "GgO0UoyQ5FssNLItii3olo63bQ80ErAE"; //生产校验码
-	private static final String CHECK_WORD_BOX ="rMBhSYRa9OtUPkfX5mow01NlxDWtI411";//沙箱校验码
-
-	//沙箱环境的地址 -PRO
-	private static final String CALL_URL_BOX = "https://sfapi-sbox.sf-express.com/std/service";
-	//生产环境的地址 -PRO
-	private static final String CALL_URL_PROD = "https://sfapi.sf-express.com/std/service";
-	@Test
-	public void TestApi() throws UnsupportedEncodingException {
-		/**ExpressServiceCodeEnum     对应速运类-快递APIs
-		 POSTServiceCodeEnum        对应速运类-驿站APIs
-		 YJTServiceCodeEnum         对应解决方案-医寄通APIs
-		 EPSServiceCodeEnum         对应解决方案-快递管家APIs
-		 HZTServiceCodeEnum         对应解决方案-函证通APIs    2022-2-24 新增
-		 详情见code目录下枚举类，客户可自行修改引用的该类
-		 **/
-		IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CREATE_ORDER; //下订单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_ORDER_RESP; //查订单
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_UPDATE_ORDER;//订单取消
-		// 	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_FILTER_ORDER_BSP;//订单筛选
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_ROUTES;//查路由
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_GET_SUB_MAILNO;//子单号
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_QUERY_SFWAYBILL;//查运费
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_REGISTER_ROUTE;//注册路由
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CREATE_REVERSE_ORDER;//退货下单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CANCEL_REVERSE_ORDER;//退货消单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_WANTED_INTERCEPT;//截单转寄
-		// 	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_QUERY_DELIVERTM;//时效标准及价格查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.COM_RECE_CLOUD_PRINT_WAYBILLS;//面单打印
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_UPLOAD_ROUTE;//路由上传
-		//   IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_PROMITM;//预计派送时间查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_EXCE_CHECK_PICKUP_TIME;//揽件服务时间查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_VALIDATE_WAYBILLNO;//运单号合法性校验
-
-
-		CallExpressServiceTools tools=CallExpressServiceTools.getInstance();
-		Map<String, String> params = new HashMap<String, String>();
-		String timeStamp = String.valueOf(System.currentTimeMillis());
-		String msgData = tools.packageMsgData(standardService);
-		SFCreatOrderReq sfOrder = new SFCreatOrderReq();
-		sfOrder.setOrderId("SD24090018-2");
-		sfOrder.setMonthlyCard("7551234567");
-//		1，寄件方信息 2，到件方信息
-		List<SFContactInfo> contactInfoList = new ArrayList<>();
-		SFContactInfo sendInfo = new SFContactInfo();
-		sendInfo.setContactType(1);
-		sendInfo.setCompany("深圳市佳毅兴科技有限公司");
-		sendInfo.setContact("窦慧怡");
-		sendInfo.setMobile("18128820006");
-		sendInfo.setAddress("广东省深圳市宝安区大宝路51号新柯城业园1栋5楼");
-		contactInfoList.add(sendInfo);
+	private STKService stkService;
 
-		SFContactInfo receiveInfo = new SFContactInfo();
-		receiveInfo.setContactType(2);
-		receiveInfo.setCompany("深圳市豪锦瑞科技有限公司");
-		receiveInfo.setContact("刘洋");
-		receiveInfo.setMobile("18688770976");
-		receiveInfo.setAddress("深圳市宝安区71区万源商务大厦B栋606");
-		contactInfoList.add(receiveInfo);
-		sfOrder.setContactInfoList(contactInfoList);
-
-		List<SFCargoDetail> cargoDetails = new ArrayList<>();
-		sfOrder.setCargoDetails(cargoDetails);
-		msgData = FlexJsonUtil.toJsonDeep(sfOrder);
-		params.put("partnerID", CLIENT_CODE);  // 顾客编码 ，对应丰桥上获取的clientCode
-		params.put("requestID", UUID.randomUUID().toString().replace("-", ""));
-		params.put("serviceCode",standardService.getCode());// 接口服务码
-		params.put("timestamp", timeStamp);
-		params.put("msgData", msgData);
-		params.put("msgDigest", tools.getMsgDigest(msgData,timeStamp,CHECK_WORD_BOX));
-		long startTime = System.currentTimeMillis();
-
-//		System.out.println("====调用请求：" + params.get("msgData"));
-		System.out.println("====调用实际请求：" + params);
-		String result = HttpClientUtil.post(CALL_URL_BOX, params);
-		System.out.println("====调用丰桥的接口服务代码：" + String.valueOf(standardService.getCode()) + " 接口耗时："+ String.valueOf(System.currentTimeMillis()-startTime)+"====");
-		System.out.println("===调用地址 ==="+CALL_URL_BOX);
-		System.out.println("===顾客编码 ==="+CLIENT_CODE);
-		System.out.println("===返回结果：" +result);
-//		Map<String,Object> resData = JacksonUtil.fromJson(result);
-		SFApiResp sfApiResp = FlexJsonUtil.fromJson(result, SFApiResp.class);
-		if(sfApiResp!=null){
-			if("A1000".equals(sfApiResp.getApiResultCode())){
-				String apiResultData = sfApiResp.getApiResultData();
-				SFCreatOrderResp sfApiRespData =  FlexJsonUtil.fromJson(apiResultData, SFCreatOrderResp.class);
-				if(sfApiRespData.isSuccess()){
-					SFCreateOrder sfOrderResp =  sfApiRespData.getMsgData();
-					if(!CollectionUtil.isEmpty(sfOrderResp.getWaybillNoInfoList())){
-						for (SFWaybillNoInfo sfWaybillNoInfoResp:sfOrderResp.getWaybillNoInfoList()){
-							System.out.println("顺丰物流单号： ====="+sfWaybillNoInfoResp.getWaybillNo());
-						}
-					}
-				}else {
-					System.out.println("errorCode:"+sfApiRespData.getErrorCode()+"====errorMsg:"+sfApiRespData.getErrorMsg());
-				}
-			}else {
-				System.out.println("code:"+sfApiResp.getApiResultCode()
-						+"===apiResponseID:"+sfApiResp.getApiResponseID()
-						+"===apiErrorMsg:"+sfApiResp.getApiErrorMsg());
-			}
-		}
-	}
 
 	@Test
-	public void TestCreatSFOrder(){
-		Map<String, Object> res = erpService.creatSFOrder("JYX_TEST", 50734879,"ADMIN");
-		System.out.println("res==="+res.get("success")+":"+res.get("message"));
-	}
-
-	@Test
-	public void TestCancelSFOrder(){
-		Map<String, Object> res = erpService.cancelSFOrder("JYX_TEST", 50734879,"ADMIN");
-		System.out.println("res==="+res.get("success")+":"+res.get("message"));
-	}
-	@Test
-	public void TestPrintPDF() throws UnsupportedEncodingException {
-		/**ExpressServiceCodeEnum     对应速运类-快递APIs
-		 POSTServiceCodeEnum        对应速运类-驿站APIs
-		 YJTServiceCodeEnum         对应解决方案-医寄通APIs
-		 EPSServiceCodeEnum         对应解决方案-快递管家APIs
-		 HZTServiceCodeEnum         对应解决方案-函证通APIs    2022-2-24 新增
-		 详情见code目录下枚举类，客户可自行修改引用的该类
-		 **/
-		IServiceCodeStandard standardService = ExpressServiceCodeEnum.COM_RECE_CLOUD_PRINT_WAYBILLS; //下订单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_ORDER_RESP; //查订单
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_UPDATE_ORDER;//订单取消
-		// 	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_FILTER_ORDER_BSP;//订单筛选
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_ROUTES;//查路由
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_GET_SUB_MAILNO;//子单号
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_QUERY_SFWAYBILL;//查运费
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_REGISTER_ROUTE;//注册路由
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CREATE_REVERSE_ORDER;//退货下单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_CANCEL_REVERSE_ORDER;//退货消单
-		//	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_WANTED_INTERCEPT;//截单转寄
-		// 	IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_QUERY_DELIVERTM;//时效标准及价格查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.COM_RECE_CLOUD_PRINT_WAYBILLS;//面单打印
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_UPLOAD_ROUTE;//路由上传
-		//   IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_SEARCH_PROMITM;//预计派送时间查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_EXCE_CHECK_PICKUP_TIME;//揽件服务时间查询
-		//  IServiceCodeStandard standardService = ExpressServiceCodeEnum.EXP_RECE_VALIDATE_WAYBILLNO;//运单号合法性校验
-
-
-		CallExpressServiceTools tools=CallExpressServiceTools.getInstance();
-		Map<String, String> params = new HashMap<String, String>();
-		String timeStamp = String.valueOf(System.currentTimeMillis());
-		Map<String, Object> msgDataMap = new HashMap<>();
-		msgDataMap.put("templateCode","fm_76130_standard_JYXKJWFFJ88E");
-		msgDataMap.put("version","2.0");
-		msgDataMap.put("fileType","pdf");
-		msgDataMap.put("sync","true");
-		List<Map<String,Object>> docList = new ArrayList<>();
-		Map<String,Object> doc = new HashMap<>();
-		doc.put("masterWaybillNo","SF7444488564898");
-		docList.add(doc);
-		doc = new HashMap<>();
-		doc.put("masterWaybillNo","SF7444488606478");
-		docList.add(doc);
-		msgDataMap.put("documents",docList);
-		String msgData = FlexJsonUtil.toJsonDeep(msgDataMap);
-		params.put("partnerID", CLIENT_CODE);  // 顾客编码 ，对应丰桥上获取的clientCode
-		params.put("requestID", UUID.randomUUID().toString().replace("-", ""));
-		params.put("serviceCode",standardService.getCode());// 接口服务码
-		params.put("timestamp", timeStamp);
-		params.put("msgData", msgData);
-		params.put("msgDigest", tools.getMsgDigest(msgData,timeStamp,CHECK_WORD_BOX));
-		long startTime = System.currentTimeMillis();
-//		System.out.println("====调用请求：" + params.get("msgData"));
-		System.out.println("====调用实际请求：" + params);
-		String result = HttpClientUtil.post(CALL_URL_BOX, params);
-		System.out.println("====调用丰桥的接口服务代码：" + String.valueOf(standardService.getCode()) + " 接口耗时："+ String.valueOf(System.currentTimeMillis()-startTime)+"====");
-		System.out.println("===调用地址 ==="+CALL_URL_BOX);
-		System.out.println("===顾客编码 ==="+CLIENT_CODE);
-		System.out.println("===返回结果：" +result);
-//		Map<String,Object> resData = JacksonUtil.fromJson(result);
-		SFApiResp sfApiResp = FlexJsonUtil.fromJson(result, SFApiResp.class);
-		if(sfApiResp!=null){
-			if("A1000".equals(sfApiResp.getApiResultCode())){
-				String apiResultData = sfApiResp.getApiResultData();
-				SFPrintToPDFResp sfPrintToPDFResp =  FlexJsonUtil.fromJson(apiResultData, SFCreatOrderResp.class);
-				if(sfPrintToPDFResp.isSuccess()){
-					SFPrintFileResp sfPrintFileResp =  sfPrintToPDFResp.getObj();
-					List<SFPrintFile> files = sfPrintFileResp.getFiles();
-					if(!CollectionUtil.isEmpty(files)){
-						files.stream().sorted(Comparator.comparingInt(SFPrintFile::getSeqNo));
-						for (SFPrintFile file : files) {
-							pdfDownLoad(file.getUrl(),file.getToken(),file.getWaybillNo());
-						}
-					}
-				}else {
-					System.out.println("errorCode:"+sfPrintToPDFResp.getErrorCode()+"====errorMsg:"+sfPrintToPDFResp.getErrorMessage());
-				}
-			}else {
-				System.out.println("code:"+sfApiResp.getApiResultCode()
-						+"===apiResponseID:"+sfApiResp.getApiResponseID()
-						+"===apiErrorMsg:"+sfApiResp.getApiErrorMsg());
-			}
-		}
-	}
-
-	@Test
-	public void TestpdfDownLoad(){
-		String fileUrl="https://eos-scp-core-shenzhen-futian1-oss.sf-express.com:443/v1.2/AUTH_EOS-SCP-CORE/print-file-sbox/AAABkcBBzkdSfT1fJRhKjpLt-VFNcr-a_SF7444488607870_fm_76130_standard_JYXKJWFFJ88E_1_1.pdf";
-		String token="AUTH_tkv12_f146d1855480549d262b5c46ab0ab597ff20a97d9d0db45c16bedeb4fabd112b012deadd477ee524b1d690ce01baa3cdffbb125a6ccf69b73778dba2eb5157eb29d9b3c970d295a3ca38c86f265339b4e7673f13379eb30a5b06511e78f70544cc4cdfc6c2876b2b6b012fdd1261d4dc0a993336de84ff3d3ef08dcf6775c715ea8f1ccf7c6c82a84ac370b171a5ac5311e398d02ff8a80d4a3a5acb161165ebbbfe1b7a686c5f0c6fb838db2b8c7625d1d8540df26f87d4f8e135ecce42d062";
-		String fileName="SF7444488607870";
-		pdfDownLoad(fileUrl,token,fileName);
-	}
-	private void pdfDownLoad(String fileUrl,String token,String fileName){
-		//下载地址
-//		String fileUrl = ioList.getGeneralString("ei_pdfurl"); // "https://inv.jss.com.cn/fp2/2zpnwyKkdvu9dWzE8BhmSnER0Iux3xQRMLidDJhiIE2PziVXY4lL3k83OsK0K06YctW5cf1FFHxraffj-bf16A.pdf";
-		// 定义要保存的文件的路径
-//		String fileName = ioList.getGeneralString("cu_name")+ioList.getGeneralString("ei_refno")+".pdf";//
-		String fileBasePath = "C:\\jyxsf\\"+fileName+".pdf";
-//		fileBasePath = String.valueOf(obs[5])+fileName;//发票储存路径
-		try {//X-Auth-token
-			// 创建URL对象
-			URL url = new URL(fileUrl);
-			HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
-			// 设置请求方法为GET
-			httpURLConnection.setRequestMethod("GET");
-			// 添加请求头
-			httpURLConnection.setRequestProperty("X-Auth-token", token); // 假设你的token是通过Bearer模式传递的
-			// 连接服务器
-			httpURLConnection.connect();
-			// 检查响应码
-			int responseCode = httpURLConnection.getResponseCode();
-			if (responseCode == HttpURLConnection.HTTP_OK) {
-				// 读取输入流
-				InputStream inputStream = httpURLConnection.getInputStream();
-				// 写入文件
-				FileOutputStream fileOutputStream = new FileOutputStream(fileBasePath);
-				byte[] buffer = new byte[4096];
-				int bytesRead = -1;
-				while ((bytesRead = inputStream.read(buffer)) != -1) {
-					fileOutputStream.write(buffer, 0, bytesRead);
-				}
-				// 关闭流
-				fileOutputStream.close();
-				inputStream.close();
+	public void getAssistbalanceCount(){
 
-				System.out.println("下载成功");
-			} else {
-				System.out.println("下载失败 : " + responseCode);
-			}
-			// 断开连接
-			httpURLConnection.disconnect();
-			// 打开连接
-//			URLConnection conn = url.openConnection();
-//			// 获取输入流
-//			InputStream in = conn.getInputStream();
-//			// 创建输出流
-//			FileOutputStream out = new FileOutputStream(fileBasePath);
-//			// 创建缓冲区
-//			byte[] buffer = new byte[104857600];
-//			// 读取并写入数据
-//			int len;
-//			while ((len = in.read(buffer)) != -1) {
-//				out.write(buffer, 0, len);
-//			}
-//			long size = out.getChannel().size();
-//			// 关闭流
-//			in.close();
-//			out.close();
-//                        System.out.println("size:"+size);
-			//存文件 filepath
-//			int id = commonService.saveFilePath(fileBasePath, (int) size, fileName, "管理员");
-//			baseDao.execute("update ELECINVOICE set ei_pdfattach ='"+id+";' where ei_id = "+ioList.getGeneralInt("ei_id"));
-		} catch (Exception e) {
-			e.printStackTrace();
-			String errMsg = "文件转存异常";
-			if(StringUtil.hasText(e.getMessage())){
-				errMsg = e.getMessage();
-			}else if(e.getCause()!=null&&StringUtil.hasText(e.getCause().getMessage())){
-				errMsg = e.getCause().getMessage();
-			}
-		}
 	}
 }