修复sql异常

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

@@ -56,6 +56,9 @@
             <if test="fkCustomerId != null">
                 fk_customer_id,
             </if>
+            <if test="companyType != null">
+                company_type,
+            </if>
             <if test="companyName != null">
                 company_name,
             </if>
@@ -94,6 +97,9 @@
             <if test="fkCustomerId != null">
                 #{fkCustomerId,jdbcType=CHAR},
             </if>
+            <if test="companyType != null">
+                #{companyType,jdbcType=CHAR},
+            </if>
             <if test="companyName != null">
                 #{companyName,jdbcType=VARCHAR},
             </if>
@@ -133,6 +139,9 @@
             <if test="fkCustomerId != null">
                 fk_customer_id = #{fkCustomerId,jdbcType=CHAR},
             </if>
+            <if test="companyType != null">
+                company_type = #{companyType,jdbcType=VARCHAR},
+            </if>
             <if test="companyName != null">
                 company_name = #{companyName,jdbcType=VARCHAR},
             </if>
@@ -169,6 +178,7 @@
     <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerCompanyInfo">
         update t_customer_company_info
         set fk_customer_id = #{fkCustomerId,jdbcType=CHAR},
+        company_type = #{companyType,jdbcType=VARCHAR},
         company_name = #{companyName,jdbcType=VARCHAR},
         org_code = #{orgCode,jdbcType=VARCHAR},
         principals = #{principals,jdbcType=VARCHAR},

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

@@ -65,6 +65,7 @@
        aa.is_enable as isEnable,
        aa.wx_id as wxId,
        aa.phone,
+       aa.sex,
        CASE aa.sex
       WHEN 1 THEN
           '男'

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

@@ -189,7 +189,8 @@
   </update>
 
     <select id="selectByGoodsOrderInfoGuid" parameterType="string" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoVo">
-      SELECT
+
+        SELECT
             b.guid AS guid,
             b.order_no AS orderNo,
             b.pay_no AS payNo,
@@ -199,17 +200,20 @@
             b.state AS state,
             c.account AS account,
             c.phone AS phone,
-            d.type_name AS typeName,
+            IFNULL(d.type_name,'自然人') AS typeName,
             e.pay_channel AS payChannel
         FROM
             t_goods_order_info b
         LEFT JOIN t_customer_info c ON b.fk_customer_guid = c.guid
-        LEFT JOIN t_customer_company_type d ON b.customer_type = d.guid
         LEFT JOIN t_goods_pay_order e ON e.fk_order_id = b.guid
+        LEFT JOIN t_customer_company_info f ON f.fk_customer_id = b.fk_customer_guid
+        LEFT JOIN t_customer_company_type d ON d.guid = f.company_type
+
         WHERE
             b.state = 1
         AND e.pay_status = 2
-        AND b.guid =  #{goodsOrderInfoGuid} LIMIT 1
+        AND b.guid = #{goodsOrderInfoGuid}
+        LIMIT 1
   </select>
     <!-- 根据订单guid查询订单项 -->
     <select id="queryOrderDetail" parameterType="String"