diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/RpAccountService.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/RpAccountService.java index e837b56..071de98 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/RpAccountService.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/RpAccountService.java @@ -53,4 +53,12 @@ public interface RpAccountService{ */ PageBean listPage(PageParam pageParam, RpAccount rpAccount); + /** + * 根据userNo获取数据 + * + * @param userNo + * @return + */ + RpAccount getDataByUserNo(String userNo); + } \ No newline at end of file diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/impl/RpAccountServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/impl/RpAccountServiceImpl.java index f4855a4..3c59de4 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/impl/RpAccountServiceImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/impl/RpAccountServiceImpl.java @@ -59,4 +59,11 @@ public class RpAccountServiceImpl implements RpAccountService{ paramMap.put("accountNo", rpAccount.getAccountNo()); return rpAccountDao.listPage(pageParam, paramMap); } + + @Override + public RpAccount getDataByUserNo(String userNo){ + Map paramMap = new HashMap(); + paramMap.put("userNo", userNo); + return rpAccountDao.getBy(paramMap); + } } \ No newline at end of file diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserPayInfo.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserPayInfo.java index 1796758..d944f61 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserPayInfo.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserPayInfo.java @@ -73,7 +73,31 @@ public class RpUserPayInfo extends BaseEntity implements Serializable { */ private String rsaPublicKey; - public String getPayWayCode() { + public String getOfflineAppId() { + return offlineAppId; + } + + public void setOfflineAppId(String offlineAppId) { + this.offlineAppId = offlineAppId; + } + + public String getRsaPrivateKey() { + return rsaPrivateKey; + } + + public void setRsaPrivateKey(String rsaPrivateKey) { + this.rsaPrivateKey = rsaPrivateKey; + } + + public String getRsaPublicKey() { + return rsaPublicKey; + } + + public void setRsaPublicKey(String rsaPublicKey) { + this.rsaPublicKey = rsaPublicKey; + } + + public String getPayWayCode() { return payWayCode; } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserPayConfigService.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserPayConfigService.java index 08d29a4..9a24e63 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserPayConfigService.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserPayConfigService.java @@ -85,7 +85,8 @@ public interface RpUserPayConfigService{ * 创建用户支付配置 */ void createUserPayConfig(String userNo, String userName, String productCode, String productName, Integer riskDay, String fundIntoType, - String isAutoSett, String appId, String merchantId, String partnerKey, String ali_partner, String ali_sellerId, String ali_key) throws PayBizException; + String isAutoSett, String appId, String merchantId, String partnerKey, String ali_partner, String ali_sellerId, String ali_key, + String ali_appid, String ali_rsaPrivateKey, String ali_rsaPublicKey) throws PayBizException; /** * 删除支付产品 @@ -97,7 +98,8 @@ public interface RpUserPayConfigService{ * 修改用户支付配置 */ void updateUserPayConfig(String userNo, String productCode, String productName, Integer riskDay, String fundIntoType, - String isAutoSett, String appId, String merchantId, String partnerKey, String ali_partner, String ali_sellerId, String ali_key) throws PayBizException; + String isAutoSett, String appId, String merchantId, String partnerKey, String ali_partner, String ali_sellerId, String ali_key, + String ali_appid, String ali_rsaPrivateKey, String ali_rsaPublicKey) throws PayBizException; /** * 审核 diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java index eeb278d..46169f5 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java @@ -136,7 +136,7 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ @Override public void createUserPayConfig(String userNo, String userName, String productCode, String productName, Integer riskDay, String fundIntoType, String isAutoSett, String appId, String merchantId, String partnerKey, - String ali_partner, String ali_sellerId, String ali_key) throws PayBizException{ + String ali_partner, String ali_sellerId, String ali_key, String ali_appid, String ali_rsaPrivateKey, String ali_rsaPublicKey) throws PayBizException{ RpUserPayConfig payConfig = rpUserPayConfigDao.getByUserNo(userNo, null); if(payConfig != null){ @@ -208,6 +208,9 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ rpUserPayInfo.setUserNo(userNo); rpUserPayInfo.setUserName(userName); rpUserPayInfo.setStatus(PublicStatusEnum.ACTIVE.name()); + rpUserPayInfo.setOfflineAppId(ali_appid); + rpUserPayInfo.setRsaPrivateKey(ali_rsaPrivateKey); + rpUserPayInfo.setRsaPublicKey(ali_rsaPublicKey); rpUserPayInfoService.saveData(rpUserPayInfo); }else{ rpUserPayInfo.setEditTime(new Date()); @@ -216,6 +219,9 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ rpUserPayInfo.setPartnerKey(ali_key); rpUserPayInfo.setPayWayCode(PayWayEnum.ALIPAY.name()); rpUserPayInfo.setPayWayName(PayWayEnum.ALIPAY.getDesc()); + rpUserPayInfo.setOfflineAppId(ali_appid); + rpUserPayInfo.setRsaPrivateKey(ali_rsaPrivateKey); + rpUserPayInfo.setRsaPublicKey(ali_rsaPublicKey); rpUserPayInfoService.updateData(rpUserPayInfo); } } @@ -248,7 +254,7 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ @Override public void updateUserPayConfig(String userNo, String productCode, String productName, Integer riskDay, String fundIntoType, String isAutoSett, String appId, String merchantId, String partnerKey, - String ali_partner, String ali_sellerId, String ali_key) throws PayBizException{ + String ali_partner, String ali_sellerId, String ali_key, String ali_appid, String ali_rsaPrivateKey, String ali_rsaPublicKey) throws PayBizException{ RpUserPayConfig rpUserPayConfig = rpUserPayConfigDao.getByUserNo(userNo, null); if(rpUserPayConfig == null){ throw new PayBizException(PayBizException.USER_PAY_CONFIG_IS_NOT_EXIST,"用户支付配置不存在"); @@ -312,6 +318,9 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ rpUserPayInfo.setUserNo(userNo); rpUserPayInfo.setUserName(rpUserPayConfig.getUserName()); rpUserPayInfo.setStatus(PublicStatusEnum.ACTIVE.name()); + rpUserPayInfo.setOfflineAppId(ali_appid); + rpUserPayInfo.setRsaPrivateKey(ali_rsaPrivateKey); + rpUserPayInfo.setRsaPublicKey(ali_rsaPublicKey); rpUserPayInfoService.saveData(rpUserPayInfo); }else{ rpUserPayInfo.setEditTime(new Date()); @@ -320,6 +329,9 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ rpUserPayInfo.setPartnerKey(ali_key); rpUserPayInfo.setPayWayCode(PayWayEnum.ALIPAY.name()); rpUserPayInfo.setPayWayName(PayWayEnum.ALIPAY.getDesc()); + rpUserPayInfo.setOfflineAppId(ali_appid); + rpUserPayInfo.setRsaPrivateKey(ali_rsaPrivateKey); + rpUserPayInfo.setRsaPublicKey(ali_rsaPublicKey); rpUserPayInfoService.updateData(rpUserPayInfo); } } diff --git a/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/pay/UserPayConfigController.java b/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/pay/UserPayConfigController.java index ec145f9..60b8008 100644 --- a/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/pay/UserPayConfigController.java +++ b/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/pay/UserPayConfigController.java @@ -113,9 +113,12 @@ public class UserPayConfigController { String ali_partner = request.getParameter("ali_partner"); String ali_key = request.getParameter("ali_key"); String ali_sellerId = request.getParameter("ali_sellerId"); + String ali_appid = request.getParameter("ali_appid"); + String ali_rsaPrivateKey = request.getParameter("ali_rsaPrivateKey"); + String ali_rsaPublicKey = request.getParameter("ali_rsaPublicKey"); rpUserPayConfigService.createUserPayConfig(userNo, userName, productCode, productName, rpUserPayConfig.getRiskDay(), rpUserPayConfig.getFundIntoType(), rpUserPayConfig.getIsAutoSett(), we_appId - , we_merchantId, we_partnerKey, ali_partner, ali_sellerId, ali_key); + , we_merchantId, we_partnerKey, ali_partner, ali_sellerId, ali_key, ali_appid, ali_rsaPrivateKey, ali_rsaPublicKey); dwz.setStatusCode(DWZ.SUCCESS); dwz.setMessage(DWZ.SUCCESS_MSG); model.addAttribute("dwz", dwz); @@ -160,9 +163,12 @@ public class UserPayConfigController { String ali_partner = request.getParameter("ali_partner"); String ali_key = request.getParameter("ali_key"); String ali_sellerId = request.getParameter("ali_sellerId"); + String ali_appid = request.getParameter("ali_appid"); + String ali_rsaPrivateKey = request.getParameter("ali_rsaPrivateKey"); + String ali_rsaPublicKey = request.getParameter("ali_rsaPublicKey"); rpUserPayConfigService.updateUserPayConfig(rpUserPayConfig.getUserNo(), productCode, productName, rpUserPayConfig.getRiskDay(), rpUserPayConfig.getFundIntoType(), rpUserPayConfig.getIsAutoSett(), - we_appId, we_merchantId, we_partnerKey, ali_partner, ali_sellerId, ali_key); + we_appId, we_merchantId, we_partnerKey, ali_partner, ali_sellerId, ali_key, ali_appid, ali_rsaPrivateKey, ali_rsaPublicKey); dwz.setStatusCode(DWZ.SUCCESS); dwz.setMessage(DWZ.SUCCESS_MSG); model.addAttribute("dwz", dwz); diff --git a/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/sett/SettController.java b/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/sett/SettController.java index b8233bb..7a20fca 100644 --- a/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/sett/SettController.java +++ b/roncoo-pay-web-boss/src/main/java/com/roncoo/pay/controller/sett/SettController.java @@ -28,8 +28,11 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import com.roncoo.pay.account.entity.RpAccount; import com.roncoo.pay.account.entity.RpSettRecord; +import com.roncoo.pay.account.service.RpAccountService; import com.roncoo.pay.account.service.RpSettHandleService; import com.roncoo.pay.account.service.RpSettQueryService; import com.roncoo.pay.common.core.dwz.DWZ; @@ -50,6 +53,8 @@ public class SettController { private RpSettQueryService rpSettQueryService; @Autowired private RpSettHandleService rpSettHandleService; + @Autowired + private RpAccountService rpAccountService; /** * 函数功能说明 ： 查询分页数据 @@ -185,4 +190,18 @@ public class SettController { model.addAttribute("settRecord", settRecord); return "sett/view"; } + + /** + * 函数功能说明 ：根据支付产品获取支付方式 + * + * @参数： @return + * @return String + * @throws + */ + @RequestMapping(value = "/getSettAmount", method = RequestMethod.GET) + @ResponseBody + public RpAccount getSettAmount(@RequestParam("userNo") String userNo) { + RpAccount rpAccount = rpAccountService.getDataByUserNo(userNo); + return rpAccount; + } } diff --git a/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/add.jsp b/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/add.jsp index dd07467..d3d8c4d 100644 --- a/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/add.jsp +++ b/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/add.jsp @@ -94,6 +94,18 @@ 收款账号： + + APPID： + + + + 支付宝私钥： + + + + 支付宝公钥： + + @@ -134,6 +146,9 @@ $("#ali_partner").attr("class", ""); $("#ali_sellerId").attr("class", ""); $("#ali_key").attr("class", ""); + $("#ali_appid").attr("class", ""); + $("#ali_rsaPrivateKey").attr("class", ""); + $("#ali_rsaPublicKey").attr("class", ""); if(fundIntoType == 'MERCHANT_RECEIVES'){ if(productCode != ""){ $.ajax({ @@ -157,6 +172,9 @@ $("#ali_partner").attr("class", "required"); $("#ali_sellerId").attr("class", "required"); $("#ali_key").attr("class", "required"); + $("#ali_appid").attr("class", "required"); + $("#ali_rsaPrivateKey").attr("class", "required"); + $("#ali_rsaPublicKey").attr("class", "required"); } } } diff --git a/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/edit.jsp b/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/edit.jsp index 1caf653..53b0f3e 100644 --- a/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/edit.jsp +++ b/roncoo-pay-web-boss/src/main/webapp/jsp/pay/config/edit.jsp @@ -93,6 +93,18 @@ 收款账号： + + APPID： + + + + 支付宝私钥： + + + + 支付宝公钥： + + @@ -133,6 +145,9 @@ function changeWePay(){ $("#ali_partner").attr("class", ""); $("#ali_sellerId").attr("class", ""); $("#ali_key").attr("class", ""); + $("#ali_appid").attr("class", ""); + $("#ali_rsaPrivateKey").attr("class", ""); + $("#ali_rsaPublicKey").attr("class", ""); if(fundIntoType == 'MERCHANT_RECEIVES'){ if(productCode != ""){ @@ -157,6 +172,9 @@ function changeWePay(){ $("#ali_partner").attr("class", "required"); $("#ali_sellerId").attr("class", "required"); $("#ali_key").attr("class", "required"); + $("#ali_appid").attr("class", "required"); + $("#ali_rsaPrivateKey").attr("class", "required"); + $("#ali_rsaPublicKey").attr("class", "required"); } } } diff --git a/roncoo-pay-web-boss/src/main/webapp/jsp/sett/add.jsp b/roncoo-pay-web-boss/src/main/webapp/jsp/sett/add.jsp index 01cef26..43ec500 100644 --- a/roncoo-pay-web-boss/src/main/webapp/jsp/sett/add.jsp +++ b/roncoo-pay-web-boss/src/main/webapp/jsp/sett/add.jsp @@ -13,7 +13,7 @@
用户编号：
- + 搜索
@@ -23,6 +23,13 @@ +
+
可结算余额：
+
+ +  获取可结算余额 +
+
结算金额：
@@ -51,4 +58,24 @@ - \ No newline at end of file + + \ No newline at end of file