改包名
authorXia Kaixiang <kaixiang.xia@supwisdom.com>
Sun, 5 May 2019 03:17:08 +0000 (11:17 +0800)
committerXia Kaixiang <kaixiang.xia@supwisdom.com>
Sun, 5 May 2019 03:17:31 +0000 (11:17 +0800)
46 files changed:
src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/BaseResp.java with 94% similarity]
src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/JsonResult.java with 92% similarity]
src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/ReqParam.java with 98% similarity]
src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/SupStatusRevResp.java with 91% similarity]
src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/SupYktResp.java with 97% similarity]
src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java [moved from src/main/java/com/supwisdom/dlpay/consume/bean/WechatReqResp.java with 99% similarity]
src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java [moved from src/main/java/com/supwisdom/dlpay/consume/controller/TestAction.java with 81% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/AccountDao.java with 92% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/DebitCreditDtlDao.java with 84% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeConfigDao.java with 63% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/PaytypeDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/PaytypeDao.java with 65% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/PersonDao.java with 72% similarity]
src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java [new file with mode: 0644]
src/main/java/com/supwisdom/dlpay/api/dao/UserdtlDao.java [moved from src/main/java/com/supwisdom/dlpay/consume/dao/UserdtlDao.java with 90% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TAccount.java with 97% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtl.java with 97% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TDebitCreditDtlPK.java with 96% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TPaytype.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytype.java with 96% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfig.java with 96% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TPaytypeConfigPK.java with 96% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java with 98% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java [new file with mode: 0644]
src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentityPK.java [new file with mode: 0644]
src/main/java/com/supwisdom/dlpay/api/domain/TUserdtl.java [moved from src/main/java/com/supwisdom/dlpay/consume/domain/TUserdtl.java with 99% similarity]
src/main/java/com/supwisdom/dlpay/api/domain/TUserdtlBusiness.java [new file with mode: 0644]
src/main/java/com/supwisdom/dlpay/api/service/PaytypeService.java [moved from src/main/java/com/supwisdom/dlpay/consume/service/PaytypeService.java with 84% similarity]
src/main/java/com/supwisdom/dlpay/api/service/impl/PaytypeServiceImpl.java [moved from src/main/java/com/supwisdom/dlpay/consume/service/impl/PaytypeServiceImpl.java with 72% similarity]
src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java
src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java
src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java
src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java
src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java
src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java
src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt with 97% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/comsume_builder.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/comsume_builder.kt with 96% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_service.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt with 95% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_controller.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/controller/notify_controller.kt with 93% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt [new file with mode: 0644]
src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt with 95% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/service/impl/person_service_impl.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/person_service_impl.kt with 71% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/service/pay_service.kt with 91% similarity]
src/main/kotlin/com/supwisdom/dlpay/api/service/person_service.kt [moved from src/main/kotlin/com/supwisdom/dlpay/consume/service/person_service.kt with 85% similarity]
src/main/kotlin/com/supwisdom/dlpay/user/controller/user_controller.kt
src/main/kotlin/com/supwisdom/dlpay/user/service/impl/user_service_impl.kt
src/main/kotlin/com/supwisdom/dlpay/user/service/user_service.kt
src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt

@@ -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;
@@ -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")
@@ -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;
@@ -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;
@@ -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;
@@ -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;
 
 /**
@@ -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 (file)
index 0000000..26fe874
--- /dev/null
@@ -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<TPersonIdentity, TPersonIdentityPK> {
+  @Query(value = "from TPersonIdentity t where t.thirdUserid=:thirdUserid and t.thirdSyscode=:thirdSyscode ")
+  TPersonIdentity getPersonIdentityById(@Param("thirdUserid") String thirdUserid, @Param("thirdSyscode") String thirdSyscode);
+}
@@ -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;
@@ -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/api/domain/TPersonIdentity.java b/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java
new file mode 100644 (file)
index 0000000..d825148
--- /dev/null
@@ -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 (file)
index 0000000..8ce1bfb
--- /dev/null
@@ -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;
+  }
+}
@@ -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 (file)
index 0000000..cb5e67c
--- /dev/null
@@ -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<String, Object> 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<String, Object> getContentMap() {
+    Map<String, Object> map = new HashMap<>(0);
+    if (!StringUtil.isEmpty(this.jsonContent))
+      map = gsonUtil.fromJson(this.jsonContent, new TypeToken<Map<String, Object>>() {
+      }.getType());
+    return map;
+  }
+}
@@ -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;
 
@@ -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;
 
index bf8548a..bba039e 100644 (file)
@@ -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;
index 8eb0161..f74d15d 100644 (file)
@@ -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;
index 7b87a26..e37a508 100644 (file)
@@ -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;
index ea02de7..cbb0805 100644 (file)
@@ -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.*;
index ee65ddb..22b0d9e 100644 (file)
@@ -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) {
index 25e6ec5..fa1318e 100644 (file)
@@ -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;
@@ -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
 
@@ -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
@@ -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.*
@@ -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 (file)
index 0000000..998597c
--- /dev/null
@@ -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
@@ -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
@@ -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
 
@@ -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
@@ -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
 
index d92da83..47cb717 100644 (file)
@@ -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
index 7870e13..cb57ca1 100644 (file)
@@ -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
index 57dd108..6bac9c9 100644 (file)
@@ -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
 
index e737908..4147974 100644 (file)
@@ -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