修复企业管理

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java

@@ -29,5 +29,6 @@ public class CarbonSystemApplication
     public static void main(String[] args)
     {
         SpringApplication.run(CarbonSystemApplication.class, args);
+        System.out.println("---------------------h5启动成功!---------------------");
     }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CompanyServiceImpl.java

@@ -28,7 +28,9 @@ public class CompanyServiceImpl implements CompanyService {
         int result = 0;
 
         String customerGuid = UUIDUtils.randomUUID();
+        //获取账号
         customerInfo.setAccount(TracedCodeUtils.generateShortUuid());
+
         customerInfo.setPasswd(Md5Util.toMD5("000000"));
         customerInfo.setState(1);
         customerInfo.setIsEnable(1);

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="CustomerInfoMapper">
-  <resultMap id="BaseResultMap" type="CustomerInfo">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerInfoMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="account" jdbcType="VARCHAR" property="account" />
     <result column="passwd" jdbcType="VARCHAR" property="passwd" />
@@ -41,7 +41,7 @@
     where guid = #{guid,jdbcType=CHAR}
   </select>
     <select id="searchCustomerByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
-            resultType="CustomerInfoBO">
+            resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
       SELECT
           aa.guid,
           aa.account AS account,
@@ -111,7 +111,7 @@
       state =1
     and (account=#{queryStr,jdbcType=VARCHAR} or phone=#{queryStr,jdbcType=VARCHAR})
   </select>
-  <select id="getCustomerByThreeCode" resultType="CustomerInfoBO">
+  <select id="getCustomerByThreeCode" resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
         SELECT
           aa.guid as guid,
           aa.account as account,
@@ -137,7 +137,7 @@
         AND bb.channel_type =#{channel}
         AND (bb.channel_keyword_one = #{code} or bb.channel_keyword_two=#{code})
   </select>
-  <select id="getCustomerStatisticalInfo" resultType="CustomerInfoBO">
+  <select id="getCustomerStatisticalInfo" resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
     SELECT
         aa.fk_customer_guid AS customId,
         SUM(bb.sale_num) AS carbonAmount,
@@ -159,7 +159,7 @@
   delete from t_customer_info
   where guid = #{guid,jdbcType=CHAR}
   </delete>
-  <insert id="insert" parameterType="CustomerInfo">
+  <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     insert into t_customer_info (guid, account, passwd, 
       customer_type, customer_name, nick_name, 
       pid, phone, sex, score, 
@@ -175,7 +175,7 @@
       #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
       #{modifiedTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="CustomerInfo">
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     insert into t_customer_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -308,7 +308,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="CustomerInfo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     update t_customer_info
     <set>
       <if test="account != null">
@@ -374,7 +374,7 @@
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="CustomerInfo">
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     update t_customer_info
     set account = #{account,jdbcType=VARCHAR},
       passwd = #{passwd,jdbcType=VARCHAR},

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/CustomerInfoServiceImpl.java

@@ -380,6 +380,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
             customerInfo.setCustomerType(1);
             //0 为未认证
             customerInfo.setIsValidate(0);
+            //0 删除 1未删除
+            customerInfo.setState(1);
             //默认密码
             String s = Md5Util.toMD5("000000");
             customerInfo.setPasswd(s);

sql/表结构变化语句/更新sql.sql

@@ -8,6 +8,10 @@ ALTER TABLE `t_goods_order_info` MODIFY COLUMN `state` int(11) DEFAULT NULL COMM
 #修改证书表 state 字段备注
 ALTER TABLE `t_goods_credential_info` MODIFY COLUMN `state` int(11) DEFAULT NULL COMMENT '类型 1 购买碳汇';
 
+#修改微信用户表 state 字段备注
+ALTER TABLE `t_customer_info` MODIFY COLUMN `state` int(11) DEFAULT NULL COMMENT '0 删除 1未删除';
+
+
 #新增企业类型表 lym
 CREATE TABLE `t_customer_company_type` (
   `guid` char(32) CHARACTER SET utf8mb4 NOT NULL,