支付账号-修改字段类型

happy-boot-module-payment/src/main/java/org/jeecg/modules/hlgpayaccount/entity/HlgPayAccount.java

@@ -1,104 +1,104 @@
-package org.jeecg.modules.hlgpayaccount.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-
-/**
- * @Description: hlg_pay_account
- * @Author: jeecg-boot
- * @Date:   2020-03-02
- * @Version: V1.0
- */
-@Data
-@TableName("hlg_pay_account")
-public class HlgPayAccount implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
-	private java.lang.Integer id;
-	/**户口代码*/
-	@Excel(name = "户口代码", width = 15)
-	private java.lang.String eaccod;
-	/**户口代码名称*/
-	@Excel(name = "户口代码名称", width = 15)
-	private java.lang.String eccnam;
-	/**账户代码*/
-	@Excel(name = "账户代码", width = 15)
-	private java.lang.String actcod;
-	/**账户代码名称*/
-	@Excel(name = "账户代码名称", width = 15)
-	private java.lang.String actnam;
-	/**账号*/
-	@Excel(name = "账号", width = 15)
-	private java.lang.String actnbr;
-	/**账户名称*/
-	@Excel(name = "账户名称", width = 15)
-	private java.lang.String eacnam;
-	/**账户币种*/
-	@Excel(name = "账户币种", width = 15)
-	private java.lang.String ccynbr;
-	/**账户可用余额*/
-	@Excel(name = "账户可用余额", width = 15)
-	private java.math.BigDecimal avlbal;
-	/**账户冻结余额*/
-	@Excel(name = "账户冻结余额", width = 15)
-	private java.math.BigDecimal hldbal;
-	/**存款类型*/
-	@Excel(name = "存款类型", width = 15)
-	private java.lang.String eactyp;
-	/**存款期限*/
-	@Excel(name = "存款期限", width = 15)
-	private java.lang.String mthnbr;
-	/**存款年利率*/
-	@Excel(name = "存款年利率", width = 15)
-	private java.math.BigDecimal inrval;
-	/**开户分行*/
-	@Excel(name = "开户分行", width = 15)
-	private java.lang.String bbknbr;
-	/**开户网点*/
-	@Excel(name = "开户网点", width = 15)
-	private java.lang.String brnnbr;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-	private java.lang.String actsts;
-	/**地区*/
-	@Excel(name = "地区", width = 15)
-	private java.lang.String ctycod;
-	/**开户日*/
-	@Excel(name = "开户日", width = 15)
-	private java.lang.String opndat;
-	/**户口号*/
-	@Excel(name = "户口号", width = 15)
-	private java.lang.String eacnbr;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	private java.util.Date createTime;
-	/**创建者*/
-	@Excel(name = "创建者", width = 15)
-	private java.lang.String createBy;
-	/**更新时间*/
-	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	private java.util.Date updateTime;
-	/**更新者*/
-	@Excel(name = "更新者", width = 15)
-	private java.lang.String updateBy;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-	private java.lang.String delFlag;
-	/**所属服务商*/
-	private Integer subcontractorId;
-}
+package org.jeecg.modules.hlgpayaccount.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+
+/**
+ * @Description: hlg_pay_account
+ * @Author: jeecg-boot
+ * @Date:   2020-03-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("hlg_pay_account")
+public class HlgPayAccount implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private java.lang.Integer id;
+	/**户口代码*/
+	@Excel(name = "户口代码", width = 15)
+	private java.lang.String eaccod;
+	/**户口代码名称*/
+	@Excel(name = "户口代码名称", width = 15)
+	private java.lang.String eccnam;
+	/**账户代码*/
+	@Excel(name = "账户代码", width = 15)
+	private java.lang.String actcod;
+	/**账户代码名称*/
+	@Excel(name = "账户代码名称", width = 15)
+	private java.lang.String actnam;
+	/**账号*/
+	@Excel(name = "账号", width = 15)
+	private java.lang.String actnbr;
+	/**账户名称*/
+	@Excel(name = "账户名称", width = 15)
+	private java.lang.String eacnam;
+	/**账户币种*/
+	@Excel(name = "账户币种", width = 15)
+	private java.lang.String ccynbr;
+	/**账户可用余额*/
+	@Excel(name = "账户可用余额", width = 15)
+	private java.math.BigDecimal avlbal;
+	/**账户冻结余额*/
+	@Excel(name = "账户冻结余额", width = 15)
+	private java.math.BigDecimal hldbal;
+	/**存款类型*/
+	@Excel(name = "存款类型", width = 15)
+	private java.lang.String eactyp;
+	/**存款期限*/
+	@Excel(name = "存款期限", width = 15)
+	private java.lang.String mthnbr;
+	/**存款年利率*/
+	@Excel(name = "存款年利率", width = 15)
+	private String inrval;
+	/**开户分行*/
+	@Excel(name = "开户分行", width = 15)
+	private java.lang.String bbknbr;
+	/**开户网点*/
+	@Excel(name = "开户网点", width = 15)
+	private java.lang.String brnnbr;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+	private java.lang.String actsts;
+	/**地区*/
+	@Excel(name = "地区", width = 15)
+	private java.lang.String ctycod;
+	/**开户日*/
+	@Excel(name = "开户日", width = 15)
+	private java.lang.String opndat;
+	/**户口号*/
+	@Excel(name = "户口号", width = 15)
+	private java.lang.String eacnbr;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	private java.util.Date createTime;
+	/**创建者*/
+	@Excel(name = "创建者", width = 15)
+	private java.lang.String createBy;
+	/**更新时间*/
+	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	private java.util.Date updateTime;
+	/**更新者*/
+	@Excel(name = "更新者", width = 15)
+	private java.lang.String updateBy;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	private java.lang.String delFlag;
+	/**所属服务商*/
+	private Integer subcontractorId;
+}

happy-boot-module-payment/src/main/java/org/jeecg/modules/hlgpayaccount/service/impl/HlgPayAccountServiceImpl.java

@@ -1,71 +1,71 @@
-package org.jeecg.modules.hlgpayaccount.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.hlgpayaccount.entity.HlgPayAccount;
-import org.jeecg.modules.hlgpayaccount.mapper.HlgPayAccountMapper;
-import org.jeecg.modules.hlgpayaccount.service.IHlgPayAccountService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description: hlg_pay_account
- * @Author: jeecg-boot
- * @Date: 2020-03-02
- * @Version: V1.0
- */
-@Service
-public class HlgPayAccountServiceImpl extends ServiceImpl<HlgPayAccountMapper, HlgPayAccount> implements IHlgPayAccountService {
-
-    @Override
-    @Transactional
-    public HlgPayAccount saveAccout(JSONObject jsonObject, Integer subcontractorId) {
-        HlgPayAccount hlgPayAccount = new HlgPayAccount();
-        hlgPayAccount.setEacnbr(jsonObject.getString("eacnbr"));
-        //查询当前账号是否存在
-        List<HlgPayAccount> hwPayAccoutList = baseMapper.getCount(hlgPayAccount);
-        if (hwPayAccoutList.size() > 0) {
-            hlgPayAccount = hwPayAccoutList.get(0);
-        } else {
-            hlgPayAccount.setSubcontractorId(subcontractorId);
-            hlgPayAccount.setEaccod(jsonObject.getString("eaccod"));
-            hlgPayAccount.setEccnam(jsonObject.getString("eccnam"));
-            hlgPayAccount.setActcod(jsonObject.getString("actcod"));
-            hlgPayAccount.setActnam(jsonObject.getString("actnam"));
-            hlgPayAccount.setActnbr(jsonObject.getString("actnbr"));
-            hlgPayAccount.setEacnam(jsonObject.getString("eacnam"));
-            hlgPayAccount.setCcynbr(jsonObject.getString("ccynbr"));
-            if (jsonObject.getString("avlbal") != null) {
-                hlgPayAccount.setAvlbal(new BigDecimal(jsonObject.getString("avlbal")));
-            }
-            if (jsonObject.getString("hldbal") != null) {
-                hlgPayAccount.setHldbal(new BigDecimal(jsonObject.getString("hldbal")));
-            }
-            hlgPayAccount.setEactyp(jsonObject.getString("eactyp"));
-            hlgPayAccount.setMthnbr(jsonObject.getString("mthnbr"));
-            if (jsonObject.getString("inrval") != null) {
-                hlgPayAccount.setInrval(new BigDecimal(jsonObject.getString("inrval")));
-            }
-            hlgPayAccount.setBbknbr(jsonObject.getString("bbknbr"));
-            hlgPayAccount.setBrnnbr(jsonObject.getString("brnnbr"));
-            hlgPayAccount.setActsts(jsonObject.getString("actsts"));
-            hlgPayAccount.setCtycod(jsonObject.getString("ctycod"));
-            hlgPayAccount.setOpndat(jsonObject.getString("opndat"));
-            hlgPayAccount.setCreateTime(new Date());
-            //获取当前登录用户
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            hlgPayAccount.setCreateBy(sysUser.getUsername());
-            hlgPayAccount.setDelFlag("0");
-            baseMapper.saveAccout(hlgPayAccount);
-        }
-        return hlgPayAccount;
-    }
-
-}
+package org.jeecg.modules.hlgpayaccount.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.hlgpayaccount.entity.HlgPayAccount;
+import org.jeecg.modules.hlgpayaccount.mapper.HlgPayAccountMapper;
+import org.jeecg.modules.hlgpayaccount.service.IHlgPayAccountService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: hlg_pay_account
+ * @Author: jeecg-boot
+ * @Date: 2020-03-02
+ * @Version: V1.0
+ */
+@Service
+public class HlgPayAccountServiceImpl extends ServiceImpl<HlgPayAccountMapper, HlgPayAccount> implements IHlgPayAccountService {
+
+    @Override
+    @Transactional
+    public HlgPayAccount saveAccout(JSONObject jsonObject, Integer subcontractorId) {
+        HlgPayAccount hlgPayAccount = new HlgPayAccount();
+        hlgPayAccount.setEacnbr(jsonObject.getString("eacnbr"));
+        //查询当前账号是否存在
+        List<HlgPayAccount> hwPayAccoutList = baseMapper.getCount(hlgPayAccount);
+        if (hwPayAccoutList.size() > 0) {
+            hlgPayAccount = hwPayAccoutList.get(0);
+        } else {
+            hlgPayAccount.setSubcontractorId(subcontractorId);
+            hlgPayAccount.setEaccod(jsonObject.getString("eaccod"));
+            hlgPayAccount.setEccnam(jsonObject.getString("eccnam"));
+            hlgPayAccount.setActcod(jsonObject.getString("actcod"));
+            hlgPayAccount.setActnam(jsonObject.getString("actnam"));
+            hlgPayAccount.setActnbr(jsonObject.getString("actnbr"));
+            hlgPayAccount.setEacnam(jsonObject.getString("eacnam"));
+            hlgPayAccount.setCcynbr(jsonObject.getString("ccynbr"));
+            if (jsonObject.getString("avlbal") != null) {
+                hlgPayAccount.setAvlbal(new BigDecimal(jsonObject.getString("avlbal")));
+            }
+            if (jsonObject.getString("hldbal") != null) {
+                hlgPayAccount.setHldbal(new BigDecimal(jsonObject.getString("hldbal")));
+            }
+            hlgPayAccount.setEactyp(jsonObject.getString("eactyp"));
+            hlgPayAccount.setMthnbr(jsonObject.getString("mthnbr"));
+            if (jsonObject.getString("inrval") != null) {
+                hlgPayAccount.setInrval(jsonObject.getString("inrval"));
+            }
+            hlgPayAccount.setBbknbr(jsonObject.getString("bbknbr"));
+            hlgPayAccount.setBrnnbr(jsonObject.getString("brnnbr"));
+            hlgPayAccount.setActsts(jsonObject.getString("actsts"));
+            hlgPayAccount.setCtycod(jsonObject.getString("ctycod"));
+            hlgPayAccount.setOpndat(jsonObject.getString("opndat"));
+            hlgPayAccount.setCreateTime(new Date());
+            //获取当前登录用户
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            hlgPayAccount.setCreateBy(sysUser.getUsername());
+            hlgPayAccount.setDelFlag("0");
+            baseMapper.saveAccout(hlgPayAccount);
+        }
+        return hlgPayAccount;
+    }
+
+}