From 7d7b4ae96a8ebe7787101622e1583bd030e86845 Mon Sep 17 00:00:00 2001 From: Xia Kaixiang Date: Thu, 16 May 2019 10:51:07 +0800 Subject: [PATCH] =?utf8?q?=E6=94=AF=E4=BB=98=E8=83=BD=E5=8A=9B=E9=85=8D?= =?utf8?q?=E7=BD=AE=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../supwisdom/dlpay/api/dao/PaytypeDao.java | 4 + .../supwisdom/dlpay/api/domain/TUserdtl.java | 5 +- .../system/controller/ParamController.java | 26 +++ .../dlpay/system/service/ParamService.java | 4 + .../system/service/impl/ParamServiceImpl.java | 13 ++ .../dlpay/api/transaction_builder.kt | 11 +- .../templates/system/param/paytype.html | 191 ++++++++++++++++++ .../resources/templates/system/role/func.html | 2 +- .../templates/system/role/index.html | 1 + 9 files changed, 249 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/templates/system/param/paytype.html diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java index f782db45..0b0b998b 100644 --- a/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java @@ -1,6 +1,8 @@ package com.supwisdom.dlpay.api.dao; import com.supwisdom.dlpay.api.domain.TPaytype; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -10,4 +12,6 @@ import org.springframework.stereotype.Repository; @Repository public interface PaytypeDao extends JpaRepository { TPaytype getByPaytype(String paytype); + + Page findByPaytypeContaining(String paytype, Pageable pageable); } diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java index aa195a73..694e7a9e 100644 --- a/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java @@ -33,7 +33,10 @@ public class TUserdtl { private Double befbal; @Column(name = "AMOUNT", precision = 9, scale = 2) - private Double amount; + private Double amount; //实际付款金额 + + @Column(name = "TOTAL_AMOUNT", precision = 9, scale = 2) + private Double totalAmount; //订单总金额 @Column(name = "AFTBAL", precision = 9, scale = 2) private Double aftbal; diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java b/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java index 50ab6a26..0313df12 100644 --- a/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java +++ b/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java @@ -1,6 +1,7 @@ package com.supwisdom.dlpay.system.controller; import com.supwisdom.dlpay.api.bean.JsonResult; +import com.supwisdom.dlpay.api.domain.TPaytype; import com.supwisdom.dlpay.framework.domain.TApiClient; import com.supwisdom.dlpay.framework.domain.TBusinesspara; import com.supwisdom.dlpay.framework.domain.TSyspara; @@ -346,5 +347,30 @@ public class ParamController { } } + /** + * ==================================================== + * 支付能力配置 + * ==================================================== + */ + @GetMapping("/param/paytype") + public String paytypeView() { + return "system/param/paytype"; + } + + @GetMapping("/param/paytypelist") + @PreAuthorize("hasPermission('/param/paytype','')") + @ResponseBody + public PageResult getPaytypeDataList(@RequestParam("page") Integer pageNo, + @RequestParam("limit") Integer pageSize, + @RequestParam(value = "paytype", required = false) String paytype) { + try { + if (null == pageNo || pageNo < 1) pageNo = WebConstant.PAGENO_DEFAULT; + if (null == pageSize || pageSize < 1) pageSize = WebConstant.PAGESIZE_DEFAULT; + return paramService.getPaytypePage(paytype, pageNo, pageSize); + } catch (Exception e) { + e.printStackTrace(); + return new PageResult<>(99, "系统查询错误"); + } + } } diff --git a/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java b/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java index 3097754c..aa5f7ea6 100644 --- a/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java +++ b/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java @@ -1,5 +1,6 @@ package com.supwisdom.dlpay.system.service; +import com.supwisdom.dlpay.api.domain.TPaytype; import com.supwisdom.dlpay.framework.domain.TApiClient; import com.supwisdom.dlpay.framework.domain.TBusinesspara; import com.supwisdom.dlpay.framework.domain.TSyspara; @@ -42,4 +43,7 @@ public interface ParamService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) boolean deleteApiClient(TApiClient apiClient); + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) + PageResult getPaytypePage(String paytype, int pageNo, int pageSize); + } diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java b/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java index 8d63932e..5ed8ca96 100644 --- a/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java +++ b/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java @@ -1,5 +1,7 @@ package com.supwisdom.dlpay.system.service.impl; +import com.supwisdom.dlpay.api.dao.PaytypeDao; +import com.supwisdom.dlpay.api.domain.TPaytype; import com.supwisdom.dlpay.framework.dao.ApiClientDao; import com.supwisdom.dlpay.framework.dao.BusinessparaDao; import com.supwisdom.dlpay.framework.dao.SysparaDao; @@ -34,6 +36,8 @@ public class ParamServiceImpl implements ParamService { private BusinessparaDao businessparaDao; @Autowired private ApiClientDao apiClientDao; + @Autowired + private PaytypeDao paytypeDao; @Override public PageResult getSysparaPage(Integer paraid, String paraname, int pageNo, int pageSize) { @@ -139,4 +143,13 @@ public class ParamServiceImpl implements ParamService { return false; } + @Override + public PageResult getPaytypePage(String paytype, int pageNo, int pageSize) { + Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by("paytype")); + if (!StringUtil.isEmpty(paytype)) { + return new PageResult<>(paytypeDao.findByPaytypeContaining(paytype.trim(), pageable)); + } + return new PageResult<>(paytypeDao.findAll(pageable)); + } + } diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt b/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt index 2cb6caa9..32ced967 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt @@ -6,7 +6,6 @@ import com.supwisdom.dlpay.api.service.PersonBalancePayService class PersonTranactionBuilder(val parent: TransactionBuilder) { var userid: String = "" var userName: String = "" - var payCode: String = "" var amount: Double = 0.0 var summary: String = "" var oppositeAccno: String = "" @@ -27,8 +26,6 @@ class ShopTransactionBuilder(val parent: TransactionBuilder) { var oppositeName: String = "" var oppositeType: String = "" - - var payCode: String = "" fun and(): TransactionBuilder { return parent } @@ -53,8 +50,11 @@ class TransactionBuilder { var transDate: String = "" var transTime: String = "" - var payCode: String = "" + var transCode: Int = 0 //交易码,各明细流水统一 var refno: String = "" + var outtradeno:String="" //第三方流水号 + val extendMap = mutableMapOf() //存调第三方需要的参数信息，存数据库 TB_USERDTL_BUSINESS + val resultMap = mutableMapOf() //存调第三方结果数据 fun person(): PersonTranactionBuilder { return PersonTranactionBuilder(this).also { @@ -92,7 +92,7 @@ class TransactionExample { val builder = TransactionBuilder().apply { this.transDate = transDate this.transTime = transTime - this.payCode = "3001" + this.transCode = 3001 }.person().apply { this.userid = userid // 可以再优化，直接用 person 对象 this.userName = person.accname @@ -104,7 +104,6 @@ class TransactionExample { this.amount = amount / 100.0 // 金额考虑减和加 this.summary = "POS消费" }.and() - if (manageFee > 0) { builder.subject().apply { val subject = accountUtilServcie.readSubject("2001") diff --git a/src/main/resources/templates/system/param/paytype.html b/src/main/resources/templates/system/param/paytype.html new file mode 100644 index 00000000..8f9883a6 --- /dev/null +++ b/src/main/resources/templates/system/param/paytype.html @@ -0,0 +1,191 @@ +
+
+

支付能力配置

+ + 参数管理 + 支付能力配置 + +
+
+
+ 搜索： + + + + +
+
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/system/role/func.html b/src/main/resources/templates/system/role/func.html index d838bb52..61cc1b19 100755 --- a/src/main/resources/templates/system/role/func.html +++ b/src/main/resources/templates/system/role/func.html @@ -1,5 +1,5 @@
-
+
    diff --git a/src/main/resources/templates/system/role/index.html b/src/main/resources/templates/system/role/index.html index 93c755d0..5dcd1f71 100644 --- a/src/main/resources/templates/system/role/index.html +++ b/src/main/resources/templates/system/role/index.html @@ -72,6 +72,7 @@ admin.putTempData('roleId', data.roleId); admin.popupCenter({ title: title, + area:['400px','600px'], path: '/role/loadfunc' }); }; -- 2.17.1