Browse Source

update .gitignore;

yujia 7 years ago
parent
commit
a980aed52c

+ 0 - 66
.gitignore

@@ -1,66 +0,0 @@
-# Eclipse
-.metadata/
-.settings/
-bin/
-tmp/
-# test/
-*.tmp
-*.bak
-*.swp
-*~.nib
-.project
-.classpath
-.loadpath
-
-## External tool builders
-.externalToolBuilders/
-
-## Locally stored "Eclipse launch configurations"
-*.launch
-
-## Java annotation processor (APT)
-.factorypath
-
-## STS (Spring Tool Suite)
-.springBeans
-
-# IntelliJ
-.idea/
-*.iml
-
-## File-based project format
-*.iws
-
-# Java
-## Compiled class file
-*.class
-#test/
-
-## Log file
-*.log
-*.log.*
-
-## Package files
-*.jar
-
-## Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Maven
-target/
-
-## Maven release plugin
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-# /src/test/
-/src/test/java/com/uas/platform/b2c/RegistForMall.java
-/src/test/java/com/uas/platform/b2c/testForRestTemplate.java
-/.gitignore
-/src/test/java/com/uas/platform/b2c/testAaa.java
-/src/main/java/com/uas/platform/b2c/fa/payment/dao/AssociatorSubAccountDao.java
-/src/main/java/com/uas/platform/b2c/fa/payment/model/AssociatorSubAccount.java

+ 0 - 15
src/main/java/com/uas/platform/b2c/fa/payment/dao/AssociatorSubAccountDao.java

@@ -1,15 +0,0 @@
-package com.uas.platform.b2c.fa.payment.dao;
-
-import com.uas.platform.b2c.fa.payment.model.AssociatorSubAccount;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by yujia on 2017/12/20.
- */
-@Repository
-public interface AssociatorSubAccountDao extends JpaSpecificationExecutor<AssociatorSubAccount>, JpaRepository<AssociatorSubAccount, Long>{
-
-
-}

+ 0 - 223
src/main/java/com/uas/platform/b2c/fa/payment/model/AssociatorSubAccount.java

@@ -1,223 +0,0 @@
-package com.uas.platform.b2c.fa.payment.model;
-
-import org.apache.commons.collections.MapUtils;
-
-import javax.persistence.*;
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * 子账户 我们称为 SubAccounnt 也包含(AssociatorSubAccount)
- * 资金汇总账户我们称为 BaseAccount
- *
- * @author yuj 2017-11-09 16:33
- */
-@Entity
-@Table(name = "bank$associatorsubaccount")
-public class AssociatorSubAccount {
-
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    /**
-     * 个人uu
-     */
-    @Column(name = "basb_useruu")
-    private Long useruu;
-
-    /**
-     * 企业的uu
-     */
-    @Column(name = "basb_enuu")
-    private Long enuu;
-
-
-    /**
-     * 是个人用户还是企业用户
-     */
-    @Column(name = "basb_ispersonal")
-    private Boolean isPersonal;
-
-    /**
-     * 个人用户是否是游离的(个人用户)还是关联帐套
-     */
-    @Column(name = "basb_dissociative")
-    private Boolean dissociative;
-
-    /**
-     * 会员子账户的id信息
-     */
-    @Column(name = "basb_subaccountid")
-    private String subAccountid;
-
-    /**
-     * 账户创建时间
-     */
-    @Column(name = "basb_createtime")
-    private Date createTime;
-
-    /**
-     * 传给平安的会员id信息(主要由useruu和enuu 信息组成)
-     */
-    @Column(name = "basb_pinganthirdid")
-    private String pingAnThirdId;
-
-    /**
-     * 手机号
-     */
-    @Column(name = "basb_telephone")
-    private String telephone;
-
-    /**
-     * 别名
-     */
-    @Column(name = "basb_nickname")
-    private String nickName;
-
-    /**
-     * 邮箱
-     */
-    @Column(name = "basb_email")
-    private String email;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public AssociatorSubAccount setId(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    public Long getUseruu() {
-        return useruu;
-    }
-
-    public AssociatorSubAccount setUseruu(Long useruu) {
-        this.useruu = useruu;
-        return this;
-    }
-
-    public Long getEnuu() {
-        return enuu;
-    }
-
-    public AssociatorSubAccount setEnuu(Long enuu) {
-        this.enuu = enuu;
-        return this;
-    }
-
-    public Boolean getPersonal() {
-        return isPersonal;
-    }
-
-    public AssociatorSubAccount setPersonal(Boolean personal) {
-        isPersonal = personal;
-        return this;
-    }
-
-    public Boolean getDissociative() {
-        return dissociative;
-    }
-
-    public AssociatorSubAccount setDissociative(Boolean dissociative) {
-        this.dissociative = dissociative;
-        return this;
-    }
-
-    public String getSubAccountid() {
-        return subAccountid;
-    }
-
-    public AssociatorSubAccount setSubAccountid(String subAccountid) {
-        this.subAccountid = subAccountid;
-        return this;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public AssociatorSubAccount setCreateTime(Date createTime) {
-        this.createTime = createTime;
-        return this;
-    }
-
-    public String getPingAnThirdId() {
-        return pingAnThirdId;
-    }
-
-    public AssociatorSubAccount setPingAnThirdId(String pingAnThirdId) {
-        this.pingAnThirdId = pingAnThirdId;
-        return this;
-    }
-
-    public AssociatorSubAccount() {
-    }
-
-    public String getTelephone() {
-        return telephone;
-    }
-
-    public AssociatorSubAccount setTelephone(String telephone) {
-        this.telephone = telephone;
-        return this;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public AssociatorSubAccount setNickName(String nickName) {
-        this.nickName = nickName;
-        return this;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public AssociatorSubAccount setEmail(String email) {
-        this.email = email;
-        return this;
-    }
-
-    public AssociatorSubAccount(Long useruu, Long enuu, Boolean isPersonal, Boolean dissociative, String subAccountid,
-                                Date createTime, String pingAnThirdId, String telephone, String nickName, String email) {
-        this.useruu = useruu;
-        this.enuu = enuu;
-        this.isPersonal = isPersonal;
-        this.dissociative = dissociative;
-        this.subAccountid = subAccountid;
-        this.createTime = createTime;
-        this.pingAnThirdId = pingAnThirdId;
-        this.telephone = telephone;
-        this.nickName = nickName;
-        this.email = email;
-    }
-
-    /**
-     *
-     */
-    public static AssociatorSubAccount createAssociatorSubAccount(HashMap map, HashMap retKeyDict, HashMap parmaKeyDict) {
-        if (MapUtils.isEmpty(map)) {
-            return null;
-        }
-        Long useruu = (Long) map.get("useruu");
-        Long enuu = (Long) map.get("enuu");
-        Boolean isPersonal = (Boolean) map.get("isPersonal");
-        Boolean dissociative = (Boolean) map.get("dissociative");
-        String subAccountid = (String) retKeyDict.get("CustAcctId");
-        Date createTime = new Date();
-        String pingAnThirdId = (String) parmaKeyDict.get("ThirdCustId");
-        String telephone = (String) map.get("MobilePhone");
-        String nickName = (String) map.get("NickName");
-        String email = (String) map.get("Email");
-        AssociatorSubAccount sub = new AssociatorSubAccount(useruu, enuu, isPersonal, dissociative,
-                subAccountid, createTime, pingAnThirdId, telephone, nickName, email);
-        return sub;
-    }
-}

BIN
src/main/resources/jxls-tpl/product/product-import-error.xls


BIN
src/main/resources/jxls-tpl/product/productStandarPutOn.xls


BIN
src/main/resources/jxls-tpl/trade/publishByBatch.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatch.xls