Merge remote-tracking branch 'origin/dev_1.1' into dev_1.1

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanyController.java

@@ -127,6 +127,32 @@ public class HlgCompanyController {
 
 
 	 /**
+	  *  编辑平台支付
+	  * @param hlgCompany
+	  * @return
+	  */
+	 @PutMapping(value = "/editCompanyPay")
+	 public Result<HlgCompany> editCompanyPay(@RequestBody HlgCompany hlgCompany) {
+		 Result<HlgCompany> result = new Result<HlgCompany>();
+		 HlgCompany hlgCompanyEntity = hlgCompanyService.getById(hlgCompany.getId());
+		 if(hlgCompanyEntity==null) {
+			 result.error500("未找到对应实体");
+		 }else {
+			 hlgCompanyEntity.setIsCpOn(hlgCompany.getIsCpOn());
+			 hlgCompanyEntity.setCpServiceRate(hlgCompany.getCpServiceRate());
+			 hlgCompanyEntity.setCpBankInfo(hlgCompany.getCpBankInfo());
+			 boolean ok = hlgCompanyService.updateCompanyById(hlgCompany);
+			 //TODO 返回false说明什么？
+			 if(ok) {
+				 result.success("修改成功!");
+			 }
+		 }
+
+		 return result;
+	 }
+
+
+	 /**
 	  * 锁定/解锁 企业
 	  *
 	  * @param hlgCompany

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

@@ -102,4 +102,10 @@ public class HlgCompany implements Serializable {
 
 	/**平台支付银行信息*/
 	private String cpBankInfo;
+
+	@TableField(exist = false)
+	private String cpSettingId;
+
+	@TableField(exist = false)
+	private Integer isOn;
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/xml/HlgCompanyMapper.xml

@@ -24,11 +24,12 @@
 		a.update_by AS "updateBy.id",
 		a.is_cp_on as "isCpOn",
 		a.cp_service_rate as "cpServiceRate",
-		a.cp_bank_info as "cpBankInfo"
+		a.cp_bank_info as "cpBankInfo",
+		hcs.id as "cpSettingId"
 	</sql>
 
     <sql id="hlgCompanyJoins">
-
+          left join hlg_cp_setting hcs on hcs.company_id=a.id
     </sql>
 
 
@@ -43,6 +44,7 @@
     <select id="findList" resultType="org.jeecg.modules.hlgcompany.entity.HlgCompany" >
         SELECT
         <include refid="hlgCompanyColumns"/>
+		,(select count(b.is_on) from hlg_cp_setting b where b.is_on=1) as "isOn"
         FROM hlg_company a
         <include refid="hlgCompanyJoins"/>
         <where>