From bc2800d923c4dbc9c71caac89dd36f31354f7d26 Mon Sep 17 00:00:00 2001 From: Xia Kaixiang Date: Sun, 5 May 2019 11:17:08 +0800 Subject: [PATCH] =?utf8?q?=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dlpay/{consume => api}/bean/BaseResp.java | 2 +- .../{consume => api}/bean/JsonResult.java | 2 +- .../dlpay/{consume => api}/bean/ReqParam.java | 2 +- .../bean/SupStatusRevResp.java | 2 +- .../{consume => api}/bean/SupYktResp.java | 2 +- .../{consume => api}/bean/WechatReqResp.java | 2 +- .../controller/TestAction.java | 6 +- .../{consume => api}/dao/AccountDao.java | 4 +- .../dao/DebitCreditDtlDao.java | 6 +- .../dao/PaytypeConfigDao.java | 6 +- .../{consume => api}/dao/PaytypeDao.java | 4 +- .../dlpay/{consume => api}/dao/PersonDao.java | 4 +- .../dlpay/api/dao/PersonIdentityDao.java | 14 ++++ .../{consume => api}/dao/UserdtlDao.java | 4 +- .../{consume => api}/domain/TAccount.java | 5 +- .../domain/TDebitCreditDtl.java | 2 +- .../domain/TDebitCreditDtlPK.java | 2 +- .../{consume => api}/domain/TPaytype.java | 2 +- .../domain/TPaytypeConfig.java | 2 +- .../domain/TPaytypeConfigPK.java | 2 +- .../{consume => api}/domain/TPerson.java | 2 +- .../dlpay/api/domain/TPersonIdentity.java | 44 +++++++++++++ .../dlpay/api/domain/TPersonIdentityPK.java | 61 ++++++++++++++++++ .../{consume => api}/domain/TUserdtl.java | 4 +- .../dlpay/api/domain/TUserdtlBusiness.java | 64 +++++++++++++++++++ .../service/PaytypeService.java | 4 +- .../service/impl/PaytypeServiceImpl.java | 12 ++-- .../MyAuthenticationFailureHandler.java | 3 +- .../MyAuthenticationSuccessHandler.java | 2 +- .../security/MyInvalidSessionStrategy.java | 2 +- .../service/impl/DayendSettleServiceImpl.java | 2 +- .../dlpay/framework/util/DateUtil.java | 38 ++++++----- .../system/controller/OperatorController.java | 2 +- .../dlpay/{consume => api}/ThirdPayCall.kt | 12 ++-- .../dlpay/{consume => api}/comsume_builder.kt | 16 ++--- .../controller/consume_service.kt | 17 +++-- .../controller/notify_controller.kt | 10 +-- .../api/controller/user_api_controller.kt | 11 ++++ .../service/impl/pay_service_impl.kt | 22 +++---- .../service/impl/person_service_impl.kt | 8 +-- .../{consume => api}/service/pay_service.kt | 8 +-- .../service/person_service.kt | 4 +- .../dlpay/user/controller/user_controller.kt | 2 +- .../user/service/impl/user_service_impl.kt | 8 +-- .../dlpay/user/service/user_service.kt | 4 +- .../dlpay/controller/UserControllerTest.kt | 4 +- 46 files changed, 318 insertions(+), 123 deletions(-) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/BaseResp.java (94%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/JsonResult.java (92%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/ReqParam.java (98%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/SupStatusRevResp.java (91%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/SupYktResp.java (97%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/bean/WechatReqResp.java (99%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/controller/TestAction.java (81%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/AccountDao.java (92%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/DebitCreditDtlDao.java (84%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/PaytypeConfigDao.java (63%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/PaytypeDao.java (65%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/PersonDao.java (72%) create mode 100644 src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java rename src/main/java/com/supwisdom/dlpay/{consume => api}/dao/UserdtlDao.java (90%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TAccount.java (97%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TDebitCreditDtl.java (97%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TDebitCreditDtlPK.java (96%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TPaytype.java (96%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TPaytypeConfig.java (96%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TPaytypeConfigPK.java (96%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TPerson.java (98%) create mode 100644 src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java create mode 100644 src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentityPK.java rename src/main/java/com/supwisdom/dlpay/{consume => api}/domain/TUserdtl.java (99%) create mode 100644 src/main/java/com/supwisdom/dlpay/api/domain/TUserdtlBusiness.java rename src/main/java/com/supwisdom/dlpay/{consume => api}/service/PaytypeService.java (84%) rename src/main/java/com/supwisdom/dlpay/{consume => api}/service/impl/PaytypeServiceImpl.java (72%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/ThirdPayCall.kt (97%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/comsume_builder.kt (96%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/controller/consume_service.kt (95%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/controller/notify_controller.kt (93%) create mode 100644 src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/service/impl/pay_service_impl.kt (95%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/service/impl/person_service_impl.kt (71%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/service/pay_service.kt (91%) rename src/main/kotlin/com/supwisdom/dlpay/{consume => api}/service/person_service.kt (85%) diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/BaseResp.java b/src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java similarity index 94% rename from src/main/java/com/supwisdom/dlpay/consume/bean/BaseResp.java rename to src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java index 1df37a71..afe41656 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/BaseResp.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; import com.supwisdom.dlpay.util.Code; diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/JsonResult.java b/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java similarity index 92% rename from src/main/java/com/supwisdom/dlpay/consume/bean/JsonResult.java rename to src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java index 24399f46..67c9b779 100755 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/JsonResult.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; import java.util.HashMap; diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/ReqParam.java b/src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java similarity index 98% rename from src/main/java/com/supwisdom/dlpay/consume/bean/ReqParam.java rename to src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java index 31fac50b..49fb0ee0 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/ReqParam.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; /** * Created by shuwei on 2019/4/9. diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/SupStatusRevResp.java b/src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java similarity index 91% rename from src/main/java/com/supwisdom/dlpay/consume/bean/SupStatusRevResp.java rename to src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java index 355fd3d9..6baae724 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/SupStatusRevResp.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; /** * Created by shuwei on 2018/10/18. diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/SupYktResp.java b/src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java similarity index 97% rename from src/main/java/com/supwisdom/dlpay/consume/bean/SupYktResp.java rename to src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java index 32caa3e1..bd9ea936 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/SupYktResp.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; /** * Created by shuwei on 2018/8/28. diff --git a/src/main/java/com/supwisdom/dlpay/consume/bean/WechatReqResp.java b/src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java similarity index 99% rename from src/main/java/com/supwisdom/dlpay/consume/bean/WechatReqResp.java rename to src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java index 13f42c48..f69eb688 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/bean/WechatReqResp.java +++ b/src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.bean; +package com.supwisdom.dlpay.api.bean; import com.supwisdom.dlpay.framework.util.MD5; import com.supwisdom.dlpay.framework.util.RandomUtils; diff --git a/src/main/java/com/supwisdom/dlpay/consume/controller/TestAction.java b/src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java similarity index 81% rename from src/main/java/com/supwisdom/dlpay/consume/controller/TestAction.java rename to src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java index 4ba7ccbc..9a2d51b4 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/controller/TestAction.java +++ b/src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java @@ -1,14 +1,12 @@ -package com.supwisdom.dlpay.consume.controller; +package com.supwisdom.dlpay.api.controller; -import com.supwisdom.dlpay.consume.bean.BaseResp; +import com.supwisdom.dlpay.api.bean.BaseResp; import com.supwisdom.dlpay.framework.data.SystemDateTime; import com.supwisdom.dlpay.framework.service.SystemUtilService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; @Controller //将所有方法标识@ResponseBody注解 @RequestMapping("/test") diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/AccountDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java similarity index 92% rename from src/main/java/com/supwisdom/dlpay/consume/dao/AccountDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java index f102258b..01817202 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/AccountDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TAccount; +import com.supwisdom.dlpay.api.domain.TAccount; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/DebitCreditDtlDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java similarity index 84% rename from src/main/java/com/supwisdom/dlpay/consume/dao/DebitCreditDtlDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java index b5004e3e..80e22f2b 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/DebitCreditDtlDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java @@ -1,7 +1,7 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TDebitCreditDtl; -import com.supwisdom.dlpay.consume.domain.TDebitCreditDtlPK; +import com.supwisdom.dlpay.api.domain.TDebitCreditDtl; +import com.supwisdom.dlpay.api.domain.TDebitCreditDtlPK; import com.supwisdom.dlpay.framework.data.VoucherTemp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeConfigDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java similarity index 63% rename from src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeConfigDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java index 62afeccb..15178a83 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeConfigDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java @@ -1,7 +1,7 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TPaytypeConfig; -import com.supwisdom.dlpay.consume.domain.TPaytypeConfigPK; +import com.supwisdom.dlpay.api.domain.TPaytypeConfig; +import com.supwisdom.dlpay.api.domain.TPaytypeConfigPK; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java similarity index 65% rename from src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java index 79e97c1c..ab493bb4 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TPaytype; +import com.supwisdom.dlpay.api.domain.TPaytype; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java similarity index 72% rename from src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java index 59a833c5..2898f3f2 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TPerson; +import com.supwisdom.dlpay.api.domain.TPerson; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java new file mode 100644 index 00000000..26fe874d --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java @@ -0,0 +1,14 @@ +package com.supwisdom.dlpay.api.dao; + +import com.supwisdom.dlpay.api.domain.TPersonIdentity; +import com.supwisdom.dlpay.api.domain.TPersonIdentityPK; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface PersonIdentityDao extends JpaRepository { + @Query(value = "from TPersonIdentity t where t.thirdUserid=:thirdUserid and t.thirdSyscode=:thirdSyscode ") + TPersonIdentity getPersonIdentityById(@Param("thirdUserid") String thirdUserid, @Param("thirdSyscode") String thirdSyscode); +} diff --git a/src/main/java/com/supwisdom/dlpay/consume/dao/UserdtlDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/UserdtlDao.java similarity index 90% rename from src/main/java/com/supwisdom/dlpay/consume/dao/UserdtlDao.java rename to src/main/java/com/supwisdom/dlpay/api/dao/UserdtlDao.java index 67cbeff6..4eb11963 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/dao/UserdtlDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/UserdtlDao.java @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.dao; +package com.supwisdom.dlpay.api.dao; -import com.supwisdom.dlpay.consume.domain.TUserdtl; +import com.supwisdom.dlpay.api.domain.TUserdtl; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TAccount.java b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java similarity index 97% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TAccount.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java index d4a4d210..dc98e910 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TAccount.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import com.supwisdom.dlpay.framework.util.MD5; import com.supwisdom.dlpay.framework.util.MoneyUtil; @@ -9,7 +9,8 @@ import javax.persistence.*; @Entity @Table(name = "TB_ACCOUNT", indexes = {@Index(name = "acc_userid_idx", columnList = "userid"), - @Index(name = "acc_status_idx", columnList = "status")}) + @Index(name = "acc_status_idx", columnList = "status"), + @Index(name = "acc_subjno_uk", unique = true, columnList = "subjno,userid")}) public class TAccount { @Id @GenericGenerator(name = "idGenerator", strategy = "uuid") diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtl.java b/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java similarity index 97% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtl.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java index 148dd586..dc5a9a96 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtl.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.*; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtlPK.java b/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java similarity index 96% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtlPK.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java index 12254a8a..b8d7973b 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtlPK.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.Column; import javax.persistence.Id; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytype.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytype.java similarity index 96% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytype.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TPaytype.java index 07d4679a..c0c1e60d 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytype.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytype.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.*; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfig.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java similarity index 96% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfig.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java index 65cf8968..020cad6b 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfig.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.*; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfigPK.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java similarity index 96% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfigPK.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java index 5046c0bb..8f7e46f0 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfigPK.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java similarity index 98% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java index cfe4872c..2b8cf43f 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import org.hibernate.annotations.GenericGenerator; diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java new file mode 100644 index 00000000..d8251487 --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java @@ -0,0 +1,44 @@ +package com.supwisdom.dlpay.api.domain; + +import javax.persistence.*; + +@Entity +@Table(name = "TB_PERSON_IDENTITY") +@IdClass(TPersonIdentityPK.class) +public class TPersonIdentity { + @Id + @Column(name = "THIRD_USERID", nullable = false, length = 60) + private String thirdUserid; + + @Id + @Column(name = "THIRD_SYSCODE", nullable = false, length = 20) + private String thirdSyscode; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "USERID") + private TPerson person; //绑定的系统用户 + + public String getThirdUserid() { + return thirdUserid; + } + + public void setThirdUserid(String thirdUserid) { + this.thirdUserid = thirdUserid; + } + + public String getThirdSyscode() { + return thirdSyscode; + } + + public void setThirdSyscode(String thirdSyscode) { + this.thirdSyscode = thirdSyscode; + } + + public TPerson getPerson() { + return person; + } + + public void setPerson(TPerson person) { + this.person = person; + } +} diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentityPK.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentityPK.java new file mode 100644 index 00000000..8ce1bfb4 --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentityPK.java @@ -0,0 +1,61 @@ +package com.supwisdom.dlpay.api.domain; + +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Id; +import java.io.Serializable; + +@Embeddable +public class TPersonIdentityPK implements Serializable { + @Id + @Column(name="THIRD_USERID", nullable = false, length = 60) + private String thirdUserid; + + @Id + @Column(name="THIRD_SYSCODE", nullable = false, length = 20) + private String thirdSyscode; + + public TPersonIdentityPK() { + } + + public TPersonIdentityPK(String thirdUserid, String thirdSyscode) { + this.thirdUserid = thirdUserid; + this.thirdSyscode = thirdSyscode; + } + + public String getThirdUserid() { + return thirdUserid; + } + + public void setThirdUserid(String thirdUserid) { + this.thirdUserid = thirdUserid; + } + + public String getThirdSyscode() { + return thirdSyscode; + } + + public void setThirdSyscode(String thirdSyscode) { + this.thirdSyscode = thirdSyscode; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TPersonIdentityPK tPersonIdentityPK = (TPersonIdentityPK) o; + if (thirdUserid != null ? !thirdUserid.equals(tPersonIdentityPK.getThirdUserid()) : thirdUserid != null) + return false; + if (thirdSyscode != null ? !thirdSyscode.equals(tPersonIdentityPK.getThirdSyscode()) : thirdSyscode != null) + return false; + + return true; + } + + @Override + public int hashCode() { + int result = thirdUserid != null ? thirdUserid.hashCode() : 0; + result = 31 * result + (thirdSyscode != null ? thirdSyscode.hashCode() : 0); + return result; + } +} diff --git a/src/main/java/com/supwisdom/dlpay/consume/domain/TUserdtl.java b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java similarity index 99% rename from src/main/java/com/supwisdom/dlpay/consume/domain/TUserdtl.java rename to src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java index 58260523..806c430e 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/domain/TUserdtl.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.consume.domain; +package com.supwisdom.dlpay.api.domain; import javax.persistence.*; @@ -52,6 +52,8 @@ public class TUserdtl { @Column(name = "OUTTRADENO", length = 60) private String outtradeno; //第三方流水号 + + @Column(name = "OPERID", precision = 9) private Integer operid; //操作员ID diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtlBusiness.java b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtlBusiness.java new file mode 100644 index 00000000..cb5e67c6 --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TUserdtlBusiness.java @@ -0,0 +1,64 @@ +package com.supwisdom.dlpay.api.domain; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.supwisdom.dlpay.framework.util.StringUtil; + +import javax.persistence.*; +import java.util.HashMap; +import java.util.Map; + +@Entity +@Table(name = "TB_USERDTL_BUSINESS") +public class TUserdtlBusiness { + @Id + @Column(name = "REFNO", nullable = false, length = 32) + private String refno; + + @Column(name = "JSON_CONTENT", length = 1000) + private String jsonContent; + + @Transient + private static final Gson gsonUtil = new Gson(); + + public TUserdtlBusiness() { + } + + public TUserdtlBusiness(String refno, String jsonContent) { + this.refno = refno; + this.jsonContent = jsonContent; + } + + public TUserdtlBusiness(String refno, Map map) { + this.refno = refno; + if (null == map || map.isEmpty()) { + this.jsonContent = ""; + } else { + this.jsonContent = gsonUtil.toJson(map); + } + } + + public String getRefno() { + return refno; + } + + public void setRefno(String refno) { + this.refno = refno; + } + + public String getJsonContent() { + return jsonContent; + } + + public void setJsonContent(String jsonContent) { + this.jsonContent = jsonContent; + } + + public Map getContentMap() { + Map map = new HashMap<>(0); + if (!StringUtil.isEmpty(this.jsonContent)) + map = gsonUtil.fromJson(this.jsonContent, new TypeToken>() { + }.getType()); + return map; + } +} diff --git a/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java b/src/main/java/com/supwisdom/dlpay/api/service/PaytypeService.java similarity index 84% rename from src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java rename to src/main/java/com/supwisdom/dlpay/api/service/PaytypeService.java index 0bfde3d6..22ca3744 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java +++ b/src/main/java/com/supwisdom/dlpay/api/service/PaytypeService.java @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.service; +package com.supwisdom.dlpay.api.service; -import com.supwisdom.dlpay.consume.domain.TPaytype; +import com.supwisdom.dlpay.api.domain.TPaytype; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/supwisdom/dlpay/consume/service/impl/PaytypeServiceImpl.java b/src/main/java/com/supwisdom/dlpay/api/service/impl/PaytypeServiceImpl.java similarity index 72% rename from src/main/java/com/supwisdom/dlpay/consume/service/impl/PaytypeServiceImpl.java rename to src/main/java/com/supwisdom/dlpay/api/service/impl/PaytypeServiceImpl.java index 1c99381e..d1d1e5c9 100644 --- a/src/main/java/com/supwisdom/dlpay/consume/service/impl/PaytypeServiceImpl.java +++ b/src/main/java/com/supwisdom/dlpay/api/service/impl/PaytypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.supwisdom.dlpay.consume.service.impl; +package com.supwisdom.dlpay.api.service.impl; -import com.supwisdom.dlpay.consume.dao.PaytypeConfigDao; -import com.supwisdom.dlpay.consume.dao.PaytypeDao; -import com.supwisdom.dlpay.consume.domain.TPaytype; -import com.supwisdom.dlpay.consume.domain.TPaytypeConfig; -import com.supwisdom.dlpay.consume.service.PaytypeService; +import com.supwisdom.dlpay.api.dao.PaytypeConfigDao; +import com.supwisdom.dlpay.api.dao.PaytypeDao; +import com.supwisdom.dlpay.api.domain.TPaytype; +import com.supwisdom.dlpay.api.domain.TPaytypeConfig; +import com.supwisdom.dlpay.api.service.PaytypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java index bf8548a2..bba039ed 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java +++ b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java @@ -1,8 +1,7 @@ package com.supwisdom.dlpay.framework.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.supwisdom.dlpay.consume.bean.BaseResp; -import com.supwisdom.dlpay.consume.bean.JsonResult; +import com.supwisdom.dlpay.api.bean.JsonResult; import com.supwisdom.dlpay.exception.ValidateCodeException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java index 8eb0161c..f74d15da 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java +++ b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java @@ -1,7 +1,7 @@ package com.supwisdom.dlpay.framework.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.supwisdom.dlpay.consume.bean.JsonResult; +import com.supwisdom.dlpay.api.bean.JsonResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java b/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java index 7b87a263..e37a5086 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java +++ b/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java @@ -1,7 +1,7 @@ package com.supwisdom.dlpay.framework.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.supwisdom.dlpay.consume.bean.JsonResult; +import com.supwisdom.dlpay.api.bean.JsonResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.web.session.InvalidSessionStrategy; diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java b/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java index ea02de77..cbb08052 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java +++ b/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java @@ -1,6 +1,6 @@ package com.supwisdom.dlpay.framework.service.impl; -import com.supwisdom.dlpay.consume.dao.DebitCreditDtlDao; +import com.supwisdom.dlpay.api.dao.DebitCreditDtlDao; import com.supwisdom.dlpay.framework.dao.*; import com.supwisdom.dlpay.framework.data.*; import com.supwisdom.dlpay.framework.domain.*; diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java b/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java index ee65ddb9..22b0d9ec 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java +++ b/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java @@ -12,16 +12,13 @@ import java.util.TimeZone; public class DateUtil { private static final Logger logger = Logger.getLogger(DateUtil.class); - private static final DateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss"); - - private static final DateFormat dayFormat = new SimpleDateFormat("yyyyMMdd"); - /** * Description: 返回一个当前时间 @return String 格式：yyyyMMddHHmmss @exception Modify * History: */ public static String getNow() { - return dateTimeFormat.format(new Date()); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMddHHmmss"); + return sdf.format(new Date()); } @@ -39,11 +36,12 @@ public class DateUtil { */ public static String getNewTime(String startTime, int interval) { try { - Date d = dateTimeFormat.parse(startTime); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMddHHmmss"); + Date d = sdf.parse(startTime); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(d.getTime()); calendar.add(Calendar.SECOND, interval); - return dateTimeFormat.format(calendar.getTime()); + return sdf.format(calendar.getTime()); } catch (ParseException e) { return startTime; } @@ -68,11 +66,12 @@ public class DateUtil { public static String getNewDay(String startDay, int intervalday) { try { - Date d = dayFormat.parse(startDay); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd"); + Date d = sdf.parse(startDay); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(d.getTime()); calendar.add(Calendar.DATE, intervalday); - return dayFormat.format(calendar.getTime()); + return sdf.format(calendar.getTime()); } catch (ParseException e) { return startDay; } @@ -83,8 +82,9 @@ public class DateUtil { */ public static long getIntervalDay(String firstDay, String secondDay) { try { - Date f = dayFormat.parse(firstDay); - Date s = dayFormat.parse(secondDay); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd"); + Date f = sdf.parse(firstDay); + Date s = sdf.parse(secondDay); long time = s.getTime() - f.getTime(); return time / (24 * 60 * 60 * 1000); } catch (ParseException e) { @@ -101,8 +101,9 @@ public class DateUtil { */ public static int compareDatetime(String firstTime, String secondTime) { try { - Date f = dateTimeFormat.parse(firstTime); - Date s = dateTimeFormat.parse(secondTime); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMddHHmmss"); + Date f = sdf.parse(firstTime); + Date s = sdf.parse(secondTime); return f.compareTo(s); } catch (ParseException e) { return 0; @@ -136,8 +137,9 @@ public class DateUtil { */ public static int compareDatetime(String firstTime, String secondTime, int seconds) { try { - Date f = dateTimeFormat.parse(firstTime); - Date s = dateTimeFormat.parse(secondTime); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMddHHmmss"); + Date f = sdf.parse(firstTime); + Date s = sdf.parse(secondTime); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(f.getTime()); calendar.add(Calendar.SECOND, seconds); @@ -171,7 +173,8 @@ public class DateUtil { public static long getInterval(String startTime, String endTime) { long duration = 0; try { - duration = dateTimeFormat.parse(endTime).getTime() - dateTimeFormat.parse(startTime).getTime(); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMddHHmmss"); + duration = sdf.parse(endTime).getTime() - sdf.parse(startTime).getTime(); } catch (ParseException e) { logger.error("Hi guys,there is an error when you try to parse the date string"); } @@ -246,9 +249,10 @@ public class DateUtil { */ public static int getWeekday(String datestr) { try { + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd"); Calendar calendar = Calendar.getInstance(); boolean isFirstSunday = (calendar.getFirstDayOfWeek() == Calendar.SUNDAY); //一周第一天是否为星期天 - Date d = dayFormat.parse(datestr); + Date d = sdf.parse(datestr); calendar.setTimeInMillis(d.getTime()); int weekDay = calendar.get(calendar.DAY_OF_WEEK); if (isFirstSunday) { diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java b/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java index 25e6ec57..fa1318e6 100644 --- a/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java +++ b/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java @@ -1,6 +1,6 @@ package com.supwisdom.dlpay.system.controller; -import com.supwisdom.dlpay.consume.bean.JsonResult; +import com.supwisdom.dlpay.api.bean.JsonResult; import com.supwisdom.dlpay.framework.domain.TOperator; import com.supwisdom.dlpay.framework.util.PageResult; import com.supwisdom.dlpay.framework.util.StringUtil; diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt b/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt similarity index 97% rename from src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt index c3f9704d..e5844c41 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt @@ -1,13 +1,13 @@ -package com.supwisdom.dlpay.consume +package com.supwisdom.dlpay.api import com.google.gson.Gson import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.ClientResponse -import com.supwisdom.dlpay.consume.bean.BaseResp -import com.supwisdom.dlpay.consume.bean.SupStatusRevResp -import com.supwisdom.dlpay.consume.bean.SupYktResp -import com.supwisdom.dlpay.consume.bean.WechatReqResp -import com.supwisdom.dlpay.consume.domain.TUserdtl +import com.supwisdom.dlpay.api.bean.BaseResp +import com.supwisdom.dlpay.api.bean.SupStatusRevResp +import com.supwisdom.dlpay.api.bean.SupYktResp +import com.supwisdom.dlpay.api.bean.WechatReqResp +import com.supwisdom.dlpay.api.domain.TUserdtl import com.supwisdom.dlpay.framework.util.* import com.supwisdom.dlpay.util.Code diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/comsume_builder.kt b/src/main/kotlin/com/supwisdom/dlpay/api/comsume_builder.kt similarity index 96% rename from src/main/kotlin/com/supwisdom/dlpay/consume/comsume_builder.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/comsume_builder.kt index 6c1c8602..4ba03d4e 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/comsume_builder.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/comsume_builder.kt @@ -1,13 +1,11 @@ -package com.supwisdom.dlpay.consume - -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TPerson -import com.supwisdom.dlpay.consume.domain.TUserdtl -import com.supwisdom.dlpay.consume.service.AccountUtilServcie -import com.supwisdom.dlpay.consume.service.PersonBalancePayService +package com.supwisdom.dlpay.api + +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TPerson +import com.supwisdom.dlpay.api.domain.TUserdtl +import com.supwisdom.dlpay.api.service.AccountUtilServcie +import com.supwisdom.dlpay.api.service.PersonBalancePayService import com.supwisdom.dlpay.exception.TransactionCheckException -import com.supwisdom.dlpay.framework.domain.TShop import com.supwisdom.dlpay.framework.domain.TShopacc import com.supwisdom.dlpay.framework.domain.TSubject import com.supwisdom.dlpay.framework.domain.TTranstype diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_service.kt similarity index 95% rename from src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_service.kt index e6edad70..f83569b9 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_service.kt @@ -1,13 +1,12 @@ -package com.supwisdom.dlpay.consume.controller +package com.supwisdom.dlpay.api.controller -import com.supwisdom.dlpay.consume.AccountHolder -import com.supwisdom.dlpay.consume.CallService -import com.supwisdom.dlpay.consume.PersonTransBuilder -import com.supwisdom.dlpay.consume.domain.TPaytype -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.api.AccountHolder +import com.supwisdom.dlpay.api.CallService +import com.supwisdom.dlpay.api.PersonTransBuilder +import com.supwisdom.dlpay.api.service.AccountUtilServcie +import com.supwisdom.dlpay.api.service.PaytypeService +import com.supwisdom.dlpay.api.service.PersonBalancePayService +import com.supwisdom.dlpay.api.service.PersonService import com.supwisdom.dlpay.exception.TransactionException import com.supwisdom.dlpay.framework.ResponseBodyBuilder import com.supwisdom.dlpay.framework.util.* diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/notify_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_controller.kt similarity index 93% rename from src/main/kotlin/com/supwisdom/dlpay/consume/controller/notify_controller.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_controller.kt index a9fe3fd9..d0fabc1d 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/notify_controller.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_controller.kt @@ -1,9 +1,9 @@ -package com.supwisdom.dlpay.consume.controller +package com.supwisdom.dlpay.api.controller -import com.supwisdom.dlpay.consume.PersonTransBuilder -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.api.PersonTransBuilder +import com.supwisdom.dlpay.api.service.AccountUtilServcie +import com.supwisdom.dlpay.api.service.PaytypeService +import com.supwisdom.dlpay.api.service.PersonBalancePayService import com.supwisdom.dlpay.framework.util.MD5 import com.supwisdom.dlpay.framework.util.TradeDict import com.supwisdom.dlpay.framework.util.XmlUtils diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt new file mode 100644 index 00000000..998597ce --- /dev/null +++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt @@ -0,0 +1,11 @@ +package com.supwisdom.dlpay.api.controller + +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/user") +class UserAPIController { + + +} \ No newline at end of file diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt similarity index 95% rename from src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt index 1034d855..c043553f 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt @@ -1,14 +1,14 @@ -package com.supwisdom.dlpay.consume.service.impl - -import com.supwisdom.dlpay.consume.PersonTransBuilder -import com.supwisdom.dlpay.consume.dao.AccountDao -import com.supwisdom.dlpay.consume.dao.DebitCreditDtlDao -import com.supwisdom.dlpay.consume.dao.UserdtlDao -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TDebitCreditDtl -import com.supwisdom.dlpay.consume.domain.TUserdtl -import com.supwisdom.dlpay.consume.service.AccountUtilServcie -import com.supwisdom.dlpay.consume.service.PersonBalancePayService +package com.supwisdom.dlpay.api.service.impl + +import com.supwisdom.dlpay.api.PersonTransBuilder +import com.supwisdom.dlpay.api.dao.AccountDao +import com.supwisdom.dlpay.api.dao.DebitCreditDtlDao +import com.supwisdom.dlpay.api.dao.UserdtlDao +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TDebitCreditDtl +import com.supwisdom.dlpay.api.domain.TUserdtl +import com.supwisdom.dlpay.api.service.AccountUtilServcie +import com.supwisdom.dlpay.api.service.PersonBalancePayService import com.supwisdom.dlpay.exception.TransactionException import com.supwisdom.dlpay.exception.TransactionProcessException import com.supwisdom.dlpay.framework.dao.ShopaccDao diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/person_service_impl.kt similarity index 71% rename from src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/service/impl/person_service_impl.kt index d6e0cf5f..5ba6a54a 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/person_service_impl.kt @@ -1,8 +1,8 @@ -package com.supwisdom.dlpay.consume.service.impl +package com.supwisdom.dlpay.api.service.impl -import com.supwisdom.dlpay.consume.dao.PersonDao -import com.supwisdom.dlpay.consume.domain.TPerson -import com.supwisdom.dlpay.consume.service.PersonService +import com.supwisdom.dlpay.api.dao.PersonDao +import com.supwisdom.dlpay.api.domain.TPerson +import com.supwisdom.dlpay.api.service.PersonService import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/pay_service.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt similarity index 91% rename from src/main/kotlin/com/supwisdom/dlpay/consume/service/pay_service.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt index 0c77e4cc..b789d399 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/pay_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt @@ -1,8 +1,8 @@ -package com.supwisdom.dlpay.consume.service +package com.supwisdom.dlpay.api.service -import com.supwisdom.dlpay.consume.PersonTransBuilder -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TUserdtl +import com.supwisdom.dlpay.api.PersonTransBuilder +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TUserdtl import com.supwisdom.dlpay.framework.domain.TShopacc import com.supwisdom.dlpay.framework.domain.TSubject import com.supwisdom.dlpay.framework.domain.TTranstype diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/person_service.kt similarity index 85% rename from src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt rename to src/main/kotlin/com/supwisdom/dlpay/api/service/person_service.kt index 1efe1a8e..1ea08ba7 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/person_service.kt @@ -1,6 +1,6 @@ -package com.supwisdom.dlpay.consume.service +package com.supwisdom.dlpay.api.service -import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.api.domain.TPerson import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/supwisdom/dlpay/user/controller/user_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/user/controller/user_controller.kt index d92da833..47cb7178 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/user/controller/user_controller.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/user/controller/user_controller.kt @@ -1,6 +1,6 @@ package com.supwisdom.dlpay.user.controller -import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.api.domain.TPerson import com.supwisdom.dlpay.framework.ResponseBodyBuilder import com.supwisdom.dlpay.framework.util.TradeDict import com.supwisdom.dlpay.shop.bean.UserParam diff --git a/src/main/kotlin/com/supwisdom/dlpay/user/service/impl/user_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/user/service/impl/user_service_impl.kt index 7870e132..cb57ca13 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/user/service/impl/user_service_impl.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/user/service/impl/user_service_impl.kt @@ -1,9 +1,9 @@ package com.supwisdom.dlpay.user.service.impl -import com.supwisdom.dlpay.consume.dao.AccountDao -import com.supwisdom.dlpay.consume.dao.PersonDao -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.api.dao.AccountDao +import com.supwisdom.dlpay.api.dao.PersonDao +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TPerson import com.supwisdom.dlpay.framework.service.SystemUtilService import com.supwisdom.dlpay.framework.util.Subject import com.supwisdom.dlpay.user.service.UserService diff --git a/src/main/kotlin/com/supwisdom/dlpay/user/service/user_service.kt b/src/main/kotlin/com/supwisdom/dlpay/user/service/user_service.kt index 57dd1089..6bac9c97 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/user/service/user_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/user/service/user_service.kt @@ -1,7 +1,7 @@ package com.supwisdom.dlpay.user.service -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TPerson import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt b/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt index e7379084..41479741 100644 --- a/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt +++ b/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt @@ -2,8 +2,8 @@ package com.supwisdom.dlpay.controller import com.google.gson.Gson import com.supwisdom.dlpay.MvcBaseTest -import com.supwisdom.dlpay.consume.domain.TAccount -import com.supwisdom.dlpay.consume.domain.TPerson +import com.supwisdom.dlpay.api.domain.TAccount +import com.supwisdom.dlpay.api.domain.TPerson import com.supwisdom.dlpay.shop.bean.UserParam import org.junit.Assert import org.junit.Test -- 2.17.1