pinganTrade

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

@@ -1,21 +1,13 @@
 package com.uas.platform.b2c.fa.payment.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.fa.payment.service.BankReceiptsService;
 import com.uas.platform.b2c.fa.payment.service.PinganTradeService;
-import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 
 /**
  * 会员交易接口
@@ -37,8 +29,8 @@ public class PinganTradeController {
 
 
 
-    /**
-     * 会员间交易
+    /**5555555555555555555555555555555555测完部分
+     * 会员间交易（验证短信动态码）【6101】
      *
      * @param isPersonal
      * @return
@@ -50,7 +42,7 @@ public class PinganTradeController {
         return str;
     }
 
-    /**
+    /**888888888888888888888888888888888交易接收成功了
      * 会员提现（验证短信验证码）【6085】
      *
      * @param isPersonal
@@ -75,7 +67,7 @@ public class PinganTradeController {
         return resultStr;
     }
 
-    /**
+    /**不用测试,我们是非自营平台
      * 会员充值(在途)【6056】
      *
      * @param isPersonal
@@ -89,5 +81,87 @@ public class PinganTradeController {
 
 
 
+    /**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

@@ -51,11 +51,73 @@ public interface PinganTradeService {
 
 
 
+    /**
+     * 查询银行单笔交易状态(6094优化版)【6110】
+     *
+     * @param isPersonal 传入的时间
+     * @return String
+     */
+    @RequestMapping(value = "/query/order/status",method = RequestMethod.POST)
+    String orderTradeStatus(Boolean isPersonal);
+
+
+    /**
+     * 交易撤销【6077】
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/expenditure/apply",method = RequestMethod.POST)
+    public String expenditureApply(Boolean isPersonal);
+
+
+    /**
+     * 查询银行子账户余额【6010】
+     *
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    @RequestMapping(value = "/settleAccount/query",method = RequestMethod.POST)
+    String querySettleAccounts(Boolean isPersonal);
+
 
 
 
 
+    /**
+     * 查询银行提现退单信息【6048】
+     * @param isPersonal 传入的数据
+     * @return
+     */
+    @RequestMapping(value = "/withDrawChargeBack",method = RequestMethod.POST)
+    String queryWithdrawChargeBack(Boolean isPersonal) ;
+
+
+    /**
+     *查询普通转账充值明细【6050】
+     *
+     * @param isPersonal 传入的数据
+     * @return String
+     */
+    @RequestMapping(value = "/query/transferDetail",method = RequestMethod.POST)
+    String queryTransferAccountsDetail(Boolean isPersonal);
 
+    /**
+     * 查询银行时间段内交易明细【6072】
+     *
+     * @param isPersonal 输入的信息
+     * @return String
+     */
+    @RequestMapping(value = "/query/trade",method = RequestMethod.POST)
+    String queryAccountTradeInfo(Boolean isPersonal);
+    /**
+     * 登记挂账【6008】（挂账子账户中余额转到对应的子账户)
+     *
+     * @param isPersonal
+     * @return
+     */
+    @RequestMapping(value = "/distributionSpecialAccount",method = RequestMethod.POST)
+    String distributionSpecialAccount(Boolean isPersonal);