企业配置付款通道

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/entity/HlgCompany.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.hlgcompany.entity;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -16,120 +17,172 @@ import org.jeecg.common.aspect.annotation.Dict;
 /**
  * @Description: hlg_company
  * @Author: jeecg-boot
- * @Date:   2020-02-17
+ * @Date: 2020-02-17
  * @Version: V1.0
  */
 @Data
 @TableName("hlg_company")
 public class HlgCompany implements Serializable {
     private static final long serialVersionUID = 1L;
-    
-	/**主键*/
-	@TableId(type = IdType.AUTO)
-	private Integer id;
-	/**所属平台*/
-	@Excel(name = "所属平台", width = 15)
-	private Integer platformId;
-
-	/**
-	 * 企业码（来源于慧盈）
-	 */
-	private String companyCode;
-	/**企业名称*/
-	@Excel(name = "企业名称", width = 15)
-	private String companyName;
-	/**税号*/
-	@Excel(name = "税号", width = 15)
-	private String dutyParagraph;
-	/**营业执照*/
-	@Excel(name = "营业执照", width = 15)
-	private String businessLicense;
-	/**所在地区-省Code*/
-	@Excel(name = "所在地区-省Code", width = 15)
-	private Integer provinceCode;
-	/**所在地区-市Code*/
-	@Excel(name = "所在地区-市Code", width = 15)
-	private Integer cityCode;
-	/**所在地区-区Code*/
-	@Excel(name = "所在地区-区Code", width = 15)
-	private Integer countryCode;
-	/**省市区全称*/
-	@Excel(name = "省市区全称", width = 15)
-	private String provinceCityCountry;
-	/**所在地区-详细地址*/
-	@Excel(name = "所在地区-详细地址", width = 15)
-	private String address;
-	/**联系人*/
-	@Excel(name = "联系人", width = 15)
-	private String contactPerson;
-	/**手机号*/
-	@Excel(name = "手机号", width = 15)
-	private String mobilePhone;
-	/**固定电话*/
-	@Excel(name = "固定电话", width = 15)
-	private String phone;
-	/**数据权限*/
-	@Excel(name = "数据权限", width = 15)
-	private String sysOrgCode;
-	/**是否锁定（0：否 1：是）*/
-	@Dict(dicCode = "is_lock")
-	@Excel(name = "是否锁定（0：否 1：是）", width = 15)
-	private Integer isLock;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	/**创建者*/
-	@Excel(name = "创建者", width = 15)
-	private String createBy;
-	/**更新时间*/
-	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	private Date updateTime;
-	/**更新者*/
-	@Excel(name = "更新者", width = 15)
-	private String updateBy;
-
-	@TableField(exist = false)
-	private String createTime_begin;
-
-	@TableField(exist = false)
-	private String createTime_end;
-
-	/**是否开启平台支付（0：关闭 1：开启）*/
-	@Dict(dicCode = "is_cp_on")
-	@TableField(exist = false)
-	private Integer isCpOn;
-
-	/**平台支付服务税率*/
-	@TableField(exist = false)
-	private Double cpServiceRate;
-
-	/**平台支付银行信息*/
-	@TableField(exist = false)
-	private String cpBankInfo;
-
-	/**平台支付服务合同*/
-	@TableField(exist = false)
-	private String cpServiceContract;
-
-	@TableField(exist = false)
-	private String cpSettingId;
-
-	@TableField(exist = false)
-	private Integer isOn;
-
-	@TableField(exist = false)
-	private Integer paymentType;
-
-	/**
-	 * 合同情况（1：待上传2：已上传）
-	 */
-	@TableField(exist = false)
-	@Dict(dicCode = "company_subcontractor_status")
-	private Integer companySubcontractorStatus;
-
-	private Integer businessBelongId; //业务归属
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 所属平台
+     */
+    @Excel(name = "所属平台", width = 15)
+    private Integer platformId;
+
+    /**
+     * 企业码（来源于慧盈）
+     */
+    private String companyCode;
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称", width = 15)
+    private String companyName;
+    /**
+     * 税号
+     */
+    @Excel(name = "税号", width = 15)
+    private String dutyParagraph;
+    /**
+     * 营业执照
+     */
+    @Excel(name = "营业执照", width = 15)
+    private String businessLicense;
+    /**
+     * 所在地区-省Code
+     */
+    @Excel(name = "所在地区-省Code", width = 15)
+    private Integer provinceCode;
+    /**
+     * 所在地区-市Code
+     */
+    @Excel(name = "所在地区-市Code", width = 15)
+    private Integer cityCode;
+    /**
+     * 所在地区-区Code
+     */
+    @Excel(name = "所在地区-区Code", width = 15)
+    private Integer countryCode;
+    /**
+     * 省市区全称
+     */
+    @Excel(name = "省市区全称", width = 15)
+    private String provinceCityCountry;
+    /**
+     * 所在地区-详细地址
+     */
+    @Excel(name = "所在地区-详细地址", width = 15)
+    private String address;
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人", width = 15)
+    private String contactPerson;
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
+    private String mobilePhone;
+    /**
+     * 固定电话
+     */
+    @Excel(name = "固定电话", width = 15)
+    private String phone;
+
+    /**
+     * 付款通道（0：外部通道 1：内部通道）
+     */
+    private Integer paymentLane;
+
+    /**
+     * 数据权限
+     */
+    @Excel(name = "数据权限", width = 15)
+    private String sysOrgCode;
+    /**
+     * 是否锁定（0：否 1：是）
+     */
+    @Dict(dicCode = "is_lock")
+    @Excel(name = "是否锁定（0：否 1：是）", width = 15)
+    private Integer isLock;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 创建者
+     */
+    @Excel(name = "创建者", width = 15)
+    private String createBy;
+    /**
+     * 更新时间
+     */
+    @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+    /**
+     * 更新者
+     */
+    @Excel(name = "更新者", width = 15)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private String createTime_begin;
+
+    @TableField(exist = false)
+    private String createTime_end;
+
+    /**
+     * 是否开启平台支付（0：关闭 1：开启）
+     */
+    @Dict(dicCode = "is_cp_on")
+    @TableField(exist = false)
+    private Integer isCpOn;
+
+    /**
+     * 平台支付服务税率
+     */
+    @TableField(exist = false)
+    private Double cpServiceRate;
+
+    /**
+     * 平台支付银行信息
+     */
+    @TableField(exist = false)
+    private String cpBankInfo;
+
+    /**
+     * 平台支付服务合同
+     */
+    @TableField(exist = false)
+    private String cpServiceContract;
+
+    @TableField(exist = false)
+    private String cpSettingId;
+
+    @TableField(exist = false)
+    private Integer isOn;
+
+    @TableField(exist = false)
+    private Integer paymentType;
+
+    /**
+     * 合同情况（1：待上传2：已上传）
+     */
+    @TableField(exist = false)
+    @Dict(dicCode = "company_subcontractor_status")
+    private Integer companySubcontractorStatus;
+
+    private Integer businessBelongId; //业务归属
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanyServiceImpl.java

@@ -170,6 +170,8 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         hlgCompany.setUpdateBy(sysUser.getUsername());
         hlgCompany.setSysOrgCode(sysDepart.getOrgCode());
         hlgCompany.setBusinessBelongId(hlgPlatform.getBusinessBelongId());
+        //默认支付通道
+        hlgCompany.setPaymentLane(1);
         this.save(hlgCompany);
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
@@ -188,6 +190,7 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         parameters.put("createBy", sysUser.getUsername());
         parameters.put("updateBy", sysUser.getUsername());
         parameters.put("businessBelongId", hlgPlatform.getBusinessBelongId());
+        parameters.put("paymentLane", hlgCompany.getPaymentLane());
         log.info("param============{}", JSONObject.toJSONString(parameters));
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));