From 700fa929642978f238210232a2fec814e5782fd0 Mon Sep 17 00:00:00 2001 From: qiaowei Date: Fri, 12 Apr 2019 10:10:26 +0800 Subject: [PATCH] =?utf8?q?Person=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=B7=A5?= =?utf8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dlpay/consume/dao/PersonDao.java | 12 ++++++++++ .../dlpay/consume/domain/TPerson.java | 22 +++++++++++++++++++ .../dlpay/consume/service/PaytypeService.java | 4 ++++ .../consume/controller/consume_service.kt | 12 ++++++---- .../consume/service/impl/pay_service_impl.kt | 14 +++++++++++- .../service/impl/person_service_impl.kt | 20 +++++++++++++++++ .../dlpay/consume/service/person_service.kt | 14 ++++++++++++ 7 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java create mode 100644 src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt create mode 100644 src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java b/src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java new file mode 100644 index 00000000..59a833c5 --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java @@ -0,0 +1,12 @@ +package com.supwisdom.dlpay.consume.dao; + +import com.supwisdom.dlpay.consume.domain.TPerson; +import org.springframework.data.jpa.repository.JpaRepository; + + +/** + * Created by shuwei on 2019/4/12. + */ +public interface PersonDao extends JpaRepository { + TPerson findByThirdUniqueIdenty(String thirdUniqueIdenty); +} diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java b/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java index a347bb94..959644cd 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java +++ b/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java @@ -52,10 +52,23 @@ public class TPerson { @Column(name = "LASTSAVED", length = 14) private String lastsaved; + /** + * 第三方唯一标识，可为学工号，银行卡号等 + * */ + @Column(name = "THIRD_UNIQUE_IDENTY", length = 32) + private String thirdUniqueIdenty; + public TPerson() { } +<<<<<<< HEAD public TPerson(String name, String sex, String status, String idtype, String idno, String country, String nation, String email, String tel, String mobile, String addr, String zipcode, String lastsaved) { +======= + public TPerson(String userid, String name, String sex, String idtype, String idno, String country, String nation, + String email, String tel, String mobile, String addr, String zipcode, String lastsaved, + String thirdUniqueIdenty) { + this.userid = userid; +>>>>>>> Person添加学工号 this.name = name; this.sex = sex; this.status = status; @@ -69,6 +82,7 @@ public class TPerson { this.addr = addr; this.zipcode = zipcode; this.lastsaved = lastsaved; + this.thirdUniqueIdenty = thirdUniqueIdenty; } public String getUserid() { @@ -182,4 +196,12 @@ public class TPerson { public void setLastsaved(String lastsaved) { this.lastsaved = lastsaved; } + + public String getThirdUniqueIdenty() { + return thirdUniqueIdenty; + } + + public void setThirdUniqueIdenty(String thirdUniqueIdenty) { + this.thirdUniqueIdenty = thirdUniqueIdenty; + } } diff --git a/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java b/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java index 7c6821df..0bfde3d6 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java +++ b/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java @@ -1,6 +1,8 @@ package com.supwisdom.dlpay.consume.service; import com.supwisdom.dlpay.consume.domain.TPaytype; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.util.Map; @@ -9,8 +11,10 @@ import java.util.Map; */ public interface PaytypeService { + @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class,readOnly = true) TPaytype getByPaytype(String paytype); + @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class,readOnly = true) Map getPaytypeConfigByPaytype(String pattype); } diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt index c2815d0c..450d49d3 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt @@ -7,6 +7,7 @@ import com.supwisdom.dlpay.consume.domain.TUserdtl import com.supwisdom.dlpay.consume.service.AccountUtilServcie import com.supwisdom.dlpay.consume.service.PaytypeService import com.supwisdom.dlpay.consume.service.PersonBalancePayService +import com.supwisdom.dlpay.consume.service.PersonService import com.supwisdom.dlpay.framework.util.DateUtil import com.supwisdom.dlpay.framework.util.TradeDict import com.supwisdom.dlpay.util.PaytypeUtil @@ -26,6 +27,8 @@ class ConsumeController { @Autowired lateinit var paytypeService: PaytypeService + @Autowired + lateinit var personService: PersonService @PostMapping("/account/pay") fun accountPay(userid: String, amount: Int, manageFee: Int): ResponseEntity { @@ -65,12 +68,13 @@ class ConsumeController { @PostMapping("/ykt/payinit") fun yktPayInit(userid: String, amount: Int, manageFee: Int, - stuempno: String, yktshopid: String): ResponseEntity { + stuempno: String, yktshopid: String, transdate: String, transtime: String, + outtradeno: String, payinfo: String): ResponseEntity { //一卡通支付款 112240 + var person = personService.getPersonByThirdUniqueIdenty(stuempno) val dtl = PersonTransBuilder.newBuilder(accountUtilServcie) - .setTransDatetime("20190411", "112311") - .setStuempno(stuempno) - .setYktshopid(yktshopid) + .setTransDatetime(transdate, transtime) + .setPerson(person) .addDetail(AccountHolder.subject("112240"), AccountHolder.shop("12323"), amount / 100.0, "") diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt index 547a4726..006ce3f7 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt @@ -100,7 +100,19 @@ class PersonBalancePayServiceImpl : PersonBalancePayService { } override fun init(builder: PersonTransBuilder): TUserdtl { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + + val userdtl = TUserdtl() + val refno = systemUtilService.refno + val systemtime = systemUtilService.sysdatetime + userdtl.refno = refno + userdtl.amount = builder.amount + userdtl.createtime = systemtime.hostdatetime + userdtl.status = TradeDict.DTL_STATUS_INIT + userdtl.transdate = builder.transDate + userdtl.transtime = builder.transTime + userdtl.userid = builder.person?.userid + userdtlDao.save(userdtl) + return userdtl } override fun wip(paydtl: TUserdtl, builder: PersonTransBuilder): TUserdtl { diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt new file mode 100644 index 00000000..e582c50d --- /dev/null +++ b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt @@ -0,0 +1,20 @@ +package com.supwisdom.dlpay.consume.service.impl + +import com.supwisdom.dlpay.consume.dao.PersonDao +import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.consume.service.PersonService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +/** + * Created by shuwei on 2019/4/12. + */ +@Service +class PersonServiceImpl : PersonService { + @Autowired + lateinit var personDao: PersonDao + + override fun getPersonByThirdUniqueIdenty(thirdUniqueIdenty: String?): TPerson { + return personDao.findByThirdUniqueIdenty(thirdUniqueIdenty) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt new file mode 100644 index 00000000..ce35e2c8 --- /dev/null +++ b/src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt @@ -0,0 +1,14 @@ +package com.supwisdom.dlpay.consume.service + +import com.supwisdom.dlpay.consume.domain.TPerson +import org.springframework.transaction.annotation.Propagation +import org.springframework.transaction.annotation.Transactional + +/** + * Created by shuwei on 2019/4/12. + */ +interface PersonService { + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = arrayOf(Exception::class), readOnly = true) + fun getPersonByThirdUniqueIdenty(thirdUniqueIdenty: String?): TPerson + +} \ No newline at end of file -- 2.17.1