Merge branch 'feature-pinganpay-yuj-20171108' of ssh://10.10.100.21/source/platform-b2c into feature-pinganpay-yuj-20171108

src/main/java/com/uas/platform/b2c/fa/payment/controller/PingAnAccountBindCardController.java

@@ -2,7 +2,6 @@ package com.uas.platform.b2c.fa.payment.controller;
 
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.payment.service.PingAnAccountBindCardService;
-import com.uas.platform.b2c.fa.payment.service.PinganTradeService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 
+
 /**
  * 会员交易接口
  *
@@ -30,7 +30,7 @@ public class PingAnAccountBindCardController {
     }
 
 
-    /**
+    /**测试成功
      * 会员绑定提现账户-银联鉴权【6066】
      *
      * @param isPersonal
@@ -41,4 +41,127 @@ public class PingAnAccountBindCardController {
         String result = pingAnAccountBindCardService.unionPaybindBankCard(isPersonal);
         return result;
     }
+
+
+    /**测试成功
+     * 会员绑定提现账户-回填银联鉴权短信码【6067】
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/smsVerification/bindBankCard", method = RequestMethod.POST)
+    public String smsVerificationBindBankCard(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.smsVerificationBindBankCard(isPersonal);
+        return result;
+    }
+
+
+    /**测试成功
+     * 会员绑定提现账户-小额鉴权【6055】
+     *
+     * @param isPersonal 传入的数据
+     * @return isPersonal
+     */
+    @RequestMapping(value = "/money", method = RequestMethod.POST)
+    public String moneyBindBankCard(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.moneyBindBankCard(isPersonal);
+        return result;
+    }
+
+
+    /**测试成功
+     * 验证鉴权金额【6064】
+     *
+     * @param isPersonal 传入的数据
+     * @return isPersonal
+     */
+    @RequestMapping(value ="/money/verification", method = RequestMethod.POST)
+    public String moneyVerificationBindBankCard(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.moneyVerificationBindBankCard(isPersonal);
+        return result;
+    }
+
+
+
+    /**444444444444444444444通讯异常接受后台响应
+     * 维护会员绑定提现账户联行号【6138】(修改会员绑定提现账户的大小额行号，超网行号和银行名称）
+     *
+     * @param isPersonal 传入的信息
+     * @return String
+     */
+    @RequestMapping(value = "/modify/bank", method = RequestMethod.POST)
+    public String modifyBindCardInfo(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.modifyBindCardInfo(isPersonal);
+        return result;
+    }
+
+
+    /**测试成功
+     * 会员绑定信息查询【6098】
+     *
+     * @param isPersonal 传入的参数
+     * @return
+     */
+    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    public String queryBindInfo(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.queryBindInfo(isPersonal);
+        return result;
+    }
+
+
+    /**测试成功
+     * 会员解绑提现账户【6065】
+     *
+     * @param isPersonal
+     * @return String
+     */
+    @RequestMapping(value = "/unbundling/card", method = RequestMethod.POST)
+    public String unbundlingCard(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.unbundlingCard(isPersonal);
+        return result;
+    }
+
+
+    /**测试成功
+     *申请修改手机号码【6083】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    @RequestMapping(value = "/modify/telephone", method = RequestMethod.POST)
+    public String modifyBindCardTelephone(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.modifyBindCardTelephone(isPersonal);
+        return result;
+    }
+
+
+
+    /**测试成功
+     * 申请修改手机号码【6084】
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/modfiy/telephone/verification", method = RequestMethod.POST)
+    public String modifyBindCardTelephoneVerification(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.modifyBindCardTelephoneVerification(isPersonal);
+        return result;
+    }
+
+
+    /**
+     * 查询小额鉴权转账结果【6061】
+     *
+     * @param isPersonal 查询的信息
+     * @return
+     */
+    @RequestMapping(value = "/query/moneyBCR", method = RequestMethod.POST)
+    public String queryMoneyBindCardResult(Boolean isPersonal) {
+        String result = pingAnAccountBindCardService.queryMoneyBindCardResult(isPersonal);
+        return result;
+    }
+
+
+
+
 }

src/main/java/com/uas/platform/b2c/fa/payment/controller/PinganTradeController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+
 /**
  * 会员交易接口
  *
@@ -28,8 +29,8 @@ public class PinganTradeController {
 
 
 
-    /**
-     * 会员间交易
+    /**5555555555555555555555555555555555测完部分
+     * 会员间交易（验证短信动态码）【6101】
      *
      * @param isPersonal
      * @return
@@ -41,7 +42,7 @@ public class PinganTradeController {
         return str;
     }
 
-    /**
+    /**888888888888888888888888888888888交易接收成功了
      * 会员提现（验证短信验证码）【6085】
      *
      * @param isPersonal
@@ -66,7 +67,7 @@ public class PinganTradeController {
         return resultStr;
     }
 
-    /**
+    /**不用测试,我们是非自营平台
      * 会员充值(在途)【6056】
      *
      * @param isPersonal
@@ -89,5 +90,87 @@ public class PinganTradeController {
         return pinganTradeService.queryRechargeDetail(orderId);
     }
 
+    /**888888888888888888888888888888888888888888888
+     * 查询银行单笔交易状态(6094优化版)【6110】
+     *
+     * @param isPersonal 传入的时间
+     * @return String
+     */
+    @RequestMapping(value = "/query/order/status",method = RequestMethod.POST)
+    public String orderTradeStatus(Boolean isPersonal) {
+        return pinganTradeService.orderTradeStatus(isPersonal);
+    }
+
+
+
+    /**
+     * 交易撤销【6077】
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/expenditure/apply",method = RequestMethod.POST)
+    public String expenditureApply(Boolean isPersonal) {
+        return pinganTradeService.expenditureApply(isPersonal);
+    }
+
+
+    /**88888888888888888888888888888888888
+     * 查询银行子账户余额【6010】
+     *
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    @RequestMapping(value = "/settleAccount/query",method = RequestMethod.POST)
+    public String querySettleAccounts(Boolean isPersonal) {
+        return pinganTradeService.querySettleAccounts(isPersonal);
+    }
+
+
+
+
+    /**888888888888888888888888888888888888888888888888
+     * 查询银行提现退单信息【6048】
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    @RequestMapping(value = "/withDrawChargeBack",method = RequestMethod.POST)
+    public String queryWithdrawChargeBack(Boolean isPersonal) {
+        return pinganTradeService.queryWithdrawChargeBack(isPersonal);
+    }
+
+
+    /**888888888888888888888888888888888888888888
+     *查询普通转账充值明细【6050】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    @RequestMapping(value = "/query/transferDetail",method = RequestMethod.POST)
+    public String queryTransferAccountsDetail(Boolean isPersonal) {
+        return pinganTradeService.queryTransferAccountsDetail(isPersonal);
+    }
+
+    /**888888888888888888888888888888888888888888888
+     * 查询银行时间段内交易明细【6072】
+     *
+     * @param isPersonal 输入的信息
+     * @return String
+     */
+    @RequestMapping(value = "/query/trade",method = RequestMethod.POST)
+    public String queryAccountTradeInfo(Boolean isPersonal) {
+        return pinganTradeService.queryAccountTradeInfo(isPersonal);
+    }
+
+    /**
+     * 登记挂账【6008】（挂账子账户中余额转到对应的子账户)
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/distributionSpecialAccount",method = RequestMethod.POST)
+    public String distributionSpecialAccount(Boolean isPersonal) {
+        return pinganTradeService.distributionSpecialAccount(isPersonal);
+    }
 
 }

src/main/java/com/uas/platform/b2c/fa/payment/service/PingAnAccountBindCardService.java

@@ -19,13 +19,81 @@ public interface PingAnAccountBindCardService {
      */
     String unionPaybindBankCard(Boolean isPersonal) ;
 
+    /**
+     * 会员绑定提现账户-回填银联鉴权短信码【6067】
+     *
+     * @param isPersonal
+     * @return
+     */
+    String smsVerificationBindBankCard(Boolean isPersonal);
 
 
+    /**
+     * 会员绑定提现账户-小额鉴权【6055】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    @RequestMapping(value = "/money", method = RequestMethod.POST)
+    String moneyBindBankCard(Boolean isPersonal);
 
+    /**
+     * 验证鉴权金额【6064】
+     *
+     * @param isPersonal
+     * @return result
+     */
+    String moneyVerificationBindBankCard(Boolean isPersonal);
 
+    /**
+     * 维护会员绑定提现账户联行号【6138】(修改会员绑定提现账户的大小额行号，超网行号和银行名称）
+     *
+     * @param isPersonal 传入的信息
+     * @return String
+     */
+    String modifyBindCardInfo(Boolean isPersonal);
 
+    /**
+     * 会员绑定信息查询【6098】
+     *
+     * @param isPersonal 传入的参数
+     * @return
+     */
+    String queryBindInfo(Boolean isPersonal) ;
 
 
 
+    /**
+     * 会员解绑提现账户【6065】
+     *
+     * @param isPersonal
+     * @return String
+     */
+    String unbundlingCard(Boolean isPersonal);
+
+
+    /**
+     * 申请修改手机号码【6084】
+     *
+     * @param isPersonal
+     * @return
+     */
+    String modifyBindCardTelephoneVerification(Boolean isPersonal);
+
+    /**
+     *申请修改手机号码【6083】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    String modifyBindCardTelephone(Boolean isPersonal);
+
+    /**
+     * 查询小额鉴权转账结果【6061】
+     *
+     * @param isPersonal 查询的信息
+     * @return
+     */
+    String queryMoneyBindCardResult(Boolean isPersonal);
 
 }

src/main/java/com/uas/platform/b2c/fa/payment/service/PinganTradeService.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.fa.payment.service;
 
+
 /**
  * 平安的facade层
  *
@@ -51,14 +52,69 @@ public interface PinganTradeService {
 
 
 
+    /**
+     * 查询银行单笔交易状态(6094优化版)【6110】
+     *
+     * @param isPersonal 传入的时间
+     * @return String
+     */
+    String orderTradeStatus(Boolean isPersonal);
 
 
+    /**
+     * 交易撤销【6077】
+     *
+     * @param isPersonal
+     * @return
+     */
+    String expenditureApply(Boolean isPersonal);
 
 
+    /**
+     * 查询银行子账户余额【6010】
+     *
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    String querySettleAccounts(Boolean isPersonal);
+
 
 
 
 
+    /**
+     * 查询银行提现退单信息【6048】
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    String queryWithdrawChargeBack(Boolean isPersonal) ;
+
+
+    /**
+     *查询普通转账充值明细【6050】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    String queryTransferAccountsDetail(Boolean isPersonal);
+
+    /**
+     * 查询银行时间段内交易明细【6072】
+     *
+     * @param isPersonal 输入的信息
+     * @return String
+     */
+    String queryAccountTradeInfo(Boolean isPersonal);
+    /**
+     * 登记挂账【6008】（挂账子账户中余额转到对应的子账户)
+     *
+     * @param isPersonal
+     * @return
+     */
+    String distributionSpecialAccount(Boolean isPersonal);
+
+
+
 
 
 

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/PingAnAccountBindCardServiceImpl.java

@@ -4,6 +4,8 @@ import com.uas.platform.b2c.fa.payment.service.PingAnAccountBindCardService;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
@@ -39,23 +41,182 @@ public class PingAnAccountBindCardServiceImpl implements PingAnAccountBindCardSe
         map.put("CustAcctId","3239000000006038");
         map.put("ThirdCustId","1000103422100010342311");
         map.put("CustName","yuj");
-        map.put("IdType","3239000000006028");
-        map.put("IdCode","10001034100010342311");
-        map.put("AcctId","10");
-        map.put("BankType","1");
-        map.put("BankName","01");
-        map.put("SBankCode","RMB");
-        map.put("BankCode","210241041004");
-        //  map.put("SerialNo","3239000000006038");
-        map.put("MobilePhone","1111111");
+        map.put("IdType","1");
+        map.put("IdCode","430682199009060199");
+        map.put("AcctId","6216913101686468");
+        map.put("BankType","2");
+        map.put("BankName","中国民生银行");
+        map.put("super_size_type","1");
+        map.put("SBankCode","305100000013");
+      //  map.put("BankCode","210241041004");
+        //map.put("SerialNo","3239000000006038");
+        map.put("MobilePhone","18613976296");
         map.put("useruu","1000103422");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/uninonPay",map, String.class);
+        return resultStr;
+    }
 
 
+    /**
+     * 会员绑定提现账户-回填银联鉴权短信码【6067】
+     *
+     * @param isPersonal
+     * @return
+     */
+    public String smsVerificationBindBankCard(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("AcctId","6216913101686468");
+        map.put("MessageCode","624334");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/uninonPay/verification",map, String.class);
+        return resultStr;
+    }
 
 
-        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/uninonPay", map, String.class);
+    /**888888888888888888888888888
+     * 会员绑定提现账户-小额鉴权【6055】
+     *
+     * @param isPersonal 传入的数据
+     * @return resultStr
+     */
+    public String moneyBindBankCard(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("CustName","yuj");
+        map.put("IdType","1");
+        map.put("IdCode","430682199009060199");
+        map.put("AcctId","6222034000005373307");
+        map.put("BankType","2");
+        map.put("BankName","中国工商银行");
+        map.put("super_size_type","1");
+        map.put("SBankCode","102100099996");
+        map.put("MobilePhone","18613976296");
+        map.put("useruu","1000103422");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/money",map, String.class);
         return resultStr;
     }
 
 
+    /**
+     * 验证鉴权金额【6064】
+     *
+     * @param isPersonal
+     * @return result
+     */
+    public String moneyVerificationBindBankCard(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("AcctId","6222034000005373307");
+        map.put("TranAmount","0.01");
+        map.put("CcyCode","RMB");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/money/verification",map, String.class);
+        return resultStr;
+    }
+
+    /**
+     * 维护会员绑定提现账户联行号【6138】(修改会员绑定提现账户的大小额行号，超网行号和银行名称）
+     *
+     * @param isPersonal 传入的信息
+     * @return String
+     */
+    public String modifyBindCardInfo(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("AcctId","6222034000005373307");
+        map.put("BankName","中国工商银行");
+        map.put("SBankCode","102100099996");
+       // map.put("BankCode","");
+        map.put("useruu","1000103422");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/modify/bank",map, String.class);
+        return resultStr;
+    }
+
+
+    /**88888888888888888888888888888888888
+     * 会员绑定信息查询【6098】
+     *
+     * @param isPersonal 传入的参数
+     * @return
+     */
+    public String queryBindInfo(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("PageNum","1");
+        map.put("SelectFlag","2");
+        map.put("useruu","1000103422");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/query",map, String.class);
+        return resultStr;
+    }
+
+
+    /**8888888888888888888888888888888888888888888
+     * 会员解绑提现账户【6065】
+     *
+     * @param isPersonal
+     * @return String
+     */
+    public String unbundlingCard(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("AcctId","6216913101686468");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/unbundling/card",map, String.class);
+        return resultStr;
+    }
+
+
+
+    /**
+     * 申请修改手机号码【6084】
+     *
+     * @param isPersonal
+     * @return
+     */
+    public String modifyBindCardTelephoneVerification(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("ModifiedType","1");
+        map.put("SerialNo","1801120032849605");
+        map.put("MessageCode","024560");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/modfiy/telephone/verification",map, String.class);
+        return resultStr;
+    }
+
+
+    /**
+     *申请修改手机号码【6083】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    public String modifyBindCardTelephone(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("ModifiedType","1");
+        map.put("NewMobilePhone","13061819009");
+        //map.put("AcctId","6216913101686468");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/modify/telephone",map, String.class);
+        return resultStr;
+    }
+
+
+    /**测试成功;
+     * 查询小额鉴权转账结果【6061】
+     *
+     * @param isPersonal 查询的信息
+     * @return
+     */
+    public String queryMoneyBindCardResult(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("OrigThirdLogNo","3239000000006038");
+        map.put("TranDate","20180114");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingAn/accountBC/query/moneyBCR",map, String.class);
+        return resultStr;
+    }
+
 }

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/PinganTradeServiceImpl.java

@@ -7,6 +7,8 @@ import com.uas.platform.b2c.fa.payment.service.PinganTradeService;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
@@ -41,21 +43,54 @@ public class PinganTradeServiceImpl implements PinganTradeService {
     @Override
     public String pay(Boolean isPersonal) {
         HashMap<String, String> map = new HashMap<>();
-        Map<String, String> infoMap = userInfoSupport.getUserInfoMap(isPersonal);
-        map.put("FuncFlag","6");
+        //正常交易====交易成功
+        //map.put("FuncFlag","1");//下单预支付（付款方→担保）  FuncFlag送1，付款方填买方，收款方填卖方
+
+        //可有余额不足;交易失败;
+        //map.put("FuncFlag","2");//确认并付款（担保→收款方）  FuncFlag送2,付款方填买方，收款方填卖方
+
+        //交易成功
+        map.put("FuncFlag","6");//直接支付（会员A→会员B）    FuncFlag送6，付款方填买方，收款方填卖方
+
+        //退款
+        //map.put("FuncFlag","1");//卖方直接支付退款给买方（FuncFlag送1，付款方填卖方，收款方填买方）
+
+        //交易失败;可用余额不足
+        //map.put("FuncFlag","3");//退款（担保→付款方）        FuncFlag送3，付款方填买方，收款方填卖方
+
+
+        //支付
         map.put("OutCustAcctId","3239000000006038");
         map.put("OutThirdCustId","1000103422100010342311");
-        map.put("OutCustName","yuj");
-        map.put("InCustAcctId","3239000000006028");
-        map.put("InThirdCustId","10001034100010342311");
-        map.put("TranAmount","10");
-        map.put("TranFee","1");
+        map.put("OutCustName","彭朝红");
+        map.put("InCustAcctId","3239000000006087");
+        map.put("InThirdCustId","10000017781004351710");
+        map.put("TranAmount","0.1");
+        map.put("TranFee","0.01");
         map.put("TranType","01");
         map.put("CcyCode","RMB");
-        map.put("ThirdHtId","210241041004");
-        //  map.put("SerialNo","3239000000006038");
-        map.put("MessageCode","1111111");
+        map.put("ThirdHtId","065005413232");
+        map.put("SerialNo","18011400793208");
+        map.put("MessageCode","321919");
         map.put("useruu","1000103422");
+
+        //直接退款
+        map.put("OutCustAcctId","3239000000006038");
+        map.put("OutThirdCustId","1000103422100010342311");
+        map.put("OutCustName","彭朝红");
+
+        map.put("InCustAcctId","3239000000006087");
+        map.put("InThirdCustId","10000017781004351710");
+
+        map.put("TranAmount","0.1");
+        map.put("TranFee","0.01");
+        map.put("TranType","01");
+        map.put("CcyCode","RMB");
+        map.put("ThirdHtId","065005413232");
+        map.put("SerialNo","18011400793208");
+        map.put("MessageCode","321919");
+        map.put("useruu","1000103422");
+
         String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/pay", map, String.class);
         return resultStr;
     }
@@ -73,20 +108,20 @@ public class PinganTradeServiceImpl implements PinganTradeService {
         map.put("CustAcctId","3239000000006038");
         map.put("ThirdCustId","1000103422100010342311");
         map.put("CustName","yuj");
-        map.put("OutAcctId","1000103422100010342311");
-        map.put("OutAcctIdName","1000103422100010342311");
+        map.put("OutAcctId","6216913101686468");
+        map.put("OutAcctIdName","彭朝红");
         map.put("CcyCode","RMB");
-        map.put("TranAmount","1000103422100010342311");
-        map.put("HandFee","1000103422100010342311");
-        map.put("SerialNo","1000103422100010342311");
-        map.put("MessageCode","1000103422100010342311");
+        map.put("TranAmount","300");
+        map.put("HandFee","0.2");
+        map.put("SerialNo","18011300791284");
+        map.put("MessageCode","026346");
         map.put("Note","");
         map.put("WebSign","");
         String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/withdrawCash/verification", map, String.class);
         return resultStr;
     }
 
-    /**
+    /**88888888888888888888888888888
      * 申请提现或支付短信动态码【6082】
      * @param isPersonal
      * @return String
@@ -96,12 +131,14 @@ public class PinganTradeServiceImpl implements PinganTradeService {
         HashMap<String, String> map = new HashMap<>();
         map.put("CustAcctId","3239000000006038");
         map.put("ThirdCustId","1000103422100010342311");
-        map.put("TranType","2");
-        map.put("TranAmount","10");
-        map.put("ThirdHtId","");
+        //map.put("TranType","1");//提现
+        map.put("TranType","2");//支付
+        map.put("TranAmount","0.1");
+        //在做支付的时候要选的;和支付接口保持一致
+        map.put("ThirdHtId","06500541323252");
         map.put("useruu","1000103422");
         map.put("AcctId","");
-        map.put("ThirdHtId","210241041004");
+
         String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/getSMSVerification", map, String.class);
         return resultStr;
     }
@@ -129,6 +166,128 @@ public class PinganTradeServiceImpl implements PinganTradeService {
         return resultStr;
     }
 
+    /**8888888888888888888888888888888888888
+     * 查询银行单笔交易状态(6094优化版)【6110】
+     *
+     * @param isPersonal 传入的时间
+     * @return String
+     */
+    public String orderTradeStatus(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("FuncFlag","3");
+        map.put("OrigThirdLogNo","JBA67LXU51BUX0000000");
+        map.put("CustAcctId","3239000000006038");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/query/order/status", map, String.class);
+        return resultStr;
+    }
+
+
+    /**
+     * 交易撤销【6077】
+     *
+     * @param isPersonal
+     * @return
+     */
+    public String expenditureApply(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("FuncFlag","1");//对应撤销6056接口   清分撤销
+        //map.put("FuncFlag","2");//对应撤销6135接口   清分冻结撤销
+        //map.put("FuncFlag","3");//清分+冻结
+        map.put("OrigThirdLogNo","JBA66NARX9LFH0000000");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/expenditure/apply", map, String.class);
+        return resultStr;
+    }
+
+
+    /**
+     * 查询银行子账户余额【6010】
+     *
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    @RequestMapping(value = "/settleAccount/query",method = RequestMethod.POST)
+    public String querySettleAccounts(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        //若SelectFlag为2时，子账号必输。
+        map.put("SelectFlag","2");
+        //map.put("SelectFlag","3");
+        map.put("PageNum","1");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/settleAccount/query", map, String.class);
+        return resultStr;
+    }
+
+
+
+
+    /**
+     * 查询银行提现退单信息【6048】
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    public String queryWithdrawChargeBack(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("FuncFlag","1");
+        map.put("BeginDate","20180113");
+        map.put("EndDate","20180114");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/withDrawChargeBack", map, String.class);
+        return resultStr;
+    }
+
+
+    /**
+     *查询普通转账充值明细【6050】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    public String queryTransferAccountsDetail(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("FuncFlag","1");
+        map.put("BeginDate","20180112");
+        map.put("EndDate","20180114");
+        map.put("PageNum","1");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/query/transferDetail", map, String.class);
+        return resultStr;
+    }
+
+    /**
+     * 查询银行时间段内交易明细【6072】
+     *
+     * @param isPersonal 输入的信息
+     * @return String
+     */
+    public String queryAccountTradeInfo(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("FuncFlag","1");//当天
+        //map.put("FuncFlag","2");//历史
+        map.put("CustAcctId","3239000000006038");
+        map.put("SelectFlag","1");
+        map.put("BeginDate","20180113");
+        map.put("EndDate","20180114");
+        map.put("PageNum","1");
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/query/trade", map, String.class);
+        return resultStr;
+    }
+    /**
+     * 登记挂账【6008】（挂账子账户中余额转到对应的子账户)
+     *
+     * @param isPersonal
+     * @return
+     */
+    public String distributionSpecialAccount(Boolean isPersonal) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("CustAcctId","3239000000006038");
+        map.put("ThirdCustId","1000103422100010342311");
+        map.put("CustName","2");
+        map.put("TranAmount","10");
+        map.put("CcyCode","RMB");
+        map.put("Note","");
+
+        String resultStr = restTemplate.postForObject("http://192.168.253.212:20280/pingan/trade/distributionSpecialAccount", map, String.class);
+        return resultStr;
+    }
+
     /**
      * 查询充值明细（见证+收单）【6146】
      *