Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/PovertyAreaMapper.xml
#	carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductInfoMapper.xml

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CollectiveFarmerMapper.xml

@@ -21,7 +21,7 @@
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
-        <collection property="farmerInfos" column="guid" select="FarmerInfoMapper.selectByCollectiveId" />
+        <collection property="farmerInfos" column="guid" select="com.hcloud.microserver.system.bank.dao.FarmerInfoMapper.selectByCollectiveId" />
     </resultMap>
 
     <sql id="Base_Column_List">

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/FarmerInfoMapper.xml

@@ -28,7 +28,7 @@
         <result column="bank_clearing_msg" jdbcType="VARCHAR" property="bankClearingMsg"/>
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
-        <association property="povertyArea" column="fk_poverty_area_id" select="PovertyAreaMapper.selectByPrimaryKey"/>
+        <association property="povertyArea" column="fk_poverty_area_id" select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
     </resultMap>
     <sql id="Base_Column_List">
         guid, fk_poverty_area_id, fk_collective_id, farmer_code, farmer_name, family_num,

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/PovertyAreaMapper.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="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper">
-    <resultMap id="BaseResultMap" type="PovertyArea">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.PovertyArea">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="poverty_area_name" jdbcType="VARCHAR" property="povertyAreaName"/>
         <result column="area_address" jdbcType="VARCHAR" property="areaAddress"/>

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductInfoMapper.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="com.hcloud.microserver.system.bank.dao.ProductInfoMapper">
-    <resultMap id="BaseResultMap" type="ProductInfo">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_product_type" jdbcType="CHAR" property="fkProductType"/>
         <result column="fk_carbon_rule" jdbcType="CHAR" property="fkCarbonRule"/>
@@ -21,13 +21,13 @@
         <result column="modified_user" jdbcType="CHAR" property="modifiedUser"/>
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
         <association property="productType" column="fk_product_type"
-                     select="ProductTypeMapper.selectByPrimaryKey"/>
+                     select="com.hcloud.microserver.system.bank.dao.ProductTypeMapper.selectByPrimaryKey"/>
         <association property="povertyArea" column="fk_poverty_area"
-                     select="PovertyAreaMapper.selectByPrimaryKey"/>
+                     select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
         <collection property="productExpansions" column="guid"
-                    select="ProductExpansionMapper.selectByProductGuid"/>
+                    select="com.hcloud.microserver.system.bank.dao.ProductExpansionMapper.selectByProductGuid"/>
         <collection property="productBelongs" column="guid"
-                    select="ProductBelongMapper.selectByProductGuid"/>
+                    select="com.hcloud.microserver.system.bank.dao.ProductBelongMapper.selectByProductGuid"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -45,7 +45,7 @@
         delete from t_product_info
         where guid = #{guid,jdbcType=CHAR}
     </delete>
-    <insert id="insert" parameterType="ProductInfo">
+    <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         insert into t_product_info (guid, fk_product_type, fk_carbon_rule,
         fk_poverty_area, product_name, product_code,
         carbon_generate_date, product_validate_num, carbon_refresh_time,
@@ -61,7 +61,7 @@
         #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP}
         )
     </insert>
-    <insert id="insertSelective" parameterType="ProductInfo">
+    <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         insert into t_product_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="guid != null">
@@ -176,7 +176,7 @@
             </if>
         </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="ProductInfo">
+    <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         update t_product_info
         <set>
             <if test="fkProductType != null">
@@ -233,7 +233,7 @@
         </set>
         where guid = #{guid,jdbcType=CHAR}
     </update>
-    <update id="updateByPrimaryKey" parameterType="ProductInfo">
+    <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         update t_product_info
         set fk_product_type = #{fkProductType,jdbcType=CHAR},
         fk_carbon_rule = #{fkCarbonRule,jdbcType=CHAR},
@@ -256,26 +256,26 @@
     </update>
 
 
-    <select id="selectListByPage" parameterType="ProductInfoForm" resultMap="BaseResultMap">
+    <select id="selectListByPage" parameterType="com.hcloud.microserver.system.facade.carbon.forms.ProductInfoForm" resultMap="BaseResultMap">
         select
-            product.guid,
-            product.fk_product_type,
-            product.fk_carbon_rule,
-            product.fk_poverty_area,
-            product.product_name,
-            product.product_code,
-            product.carbon_generate_date,
-            product.product_validate_num,
-            product.carbon_refresh_time,
-            product.carbon_sink,
-            product.product_imgs,
-            product.is_enable,
-            product.remark,
-            product.state,
-            product.create_user,
-            product.create_time,
-            product.modified_user,
-            product.modified_time
+        product.guid,
+        product.fk_product_type,
+        product.fk_carbon_rule,
+        product.fk_poverty_area,
+        product.product_name,
+        product.product_code,
+        product.carbon_generate_date,
+        product.product_validate_num,
+        product.carbon_refresh_time,
+        product.carbon_sink,
+        product.product_imgs,
+        product.is_enable,
+        product.remark,
+        product.state,
+        product.create_user,
+        product.create_time,
+        product.modified_user,
+        product.modified_time
         from t_product_info product
         <where>
             product.state = 1
@@ -338,7 +338,7 @@
         update t_product_info set state = 0
         where fk_product_type = #{productTypeGuid,jdbcType=VARCHAR}
     </update>
-    
+
     <select id="selectProductGuidsByFarmerGuids" parameterType="list" resultType="string">
         select fk_product_guid from t_product_belong
         where state = 1 and fk_farmer_guid in
@@ -347,4 +347,30 @@
         </foreach>
         group by fk_product_guid;
     </select>
+
+    <!-- 查询产品详情 lym -->
+    <!--<select id="findById" parameterType="String" resultMap="BaseResultMap">
+        select
+            product.guid,
+            product.fk_product_type,
+            product.fk_carbon_rule,
+            product.fk_poverty_area,
+            product.product_name,
+            product.product_code,
+            product.carbon_generate_date,
+            product.product_validate_num,
+            product.carbon_refresh_time,
+            product.carbon_sink,
+            product.product_imgs,
+            product.is_enable,
+            product.remark,
+            product.state,
+            product.create_user,
+            product.create_time,
+            product.modified_user,
+            product.modified_time
+            from t_product_info product
+            WHERE product.state = 1
+            AND product.guid = #{guid}
+    </select>-->
 </mapper>

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductTypeMapper.xml

@@ -10,7 +10,7 @@
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
         <result column="methodology" jdbcType="VARCHAR" property="methodology"/>
         <result column="type_desc" jdbcType="VARCHAR" property="typeDesc"/>
-        <collection property="productTypeExpansions" column="guid" select="ProductTypeExpansionMapper.selectByProductTypeGuid"/>
+        <collection property="productTypeExpansions" column="guid" select="com.hcloud.microserver.system.bank.dao.ProductTypeExpansionMapper.selectByProductTypeGuid"/>
     </resultMap>
     <sql id="Base_Column_List">
         guid, parent_id, type_name, type_val, state, modified_time, methodology, type_desc

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/mq/listener/ReceiverMessage.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.h5.config.mq.listener;
 
+import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderInfoForm;
 import com.hcloud.microserver.h5.config.mq.MQConstant;
 import com.hcloud.microserver.h5.service.OrderDetailInfoService;
@@ -8,6 +9,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 //监听hello队列，有消息时进行消费
 @Component
@@ -26,12 +28,13 @@ public class ReceiverMessage {
         String[] split = content.split("-");
         if(split.length>1){
             String orderId = split[1];
-            GoodsOrderInfoForm orderInfoBO = orderDetailInfoService.info(orderId);
-
-            Integer orderStatus = orderInfoBO.getOrderStatus();
-            if(orderStatus.intValue() ==1){
-                orderInfoService.rollbackOrderInfo(orderId);
-                System.out.println("取消订单:" + content);
+            GoodsOrderInfo goodsOrderInfo = orderInfoService.selectByPrimaryKey(orderId);
+            if(!StringUtils.isEmpty(goodsOrderInfo)){
+                Integer orderStatus = goodsOrderInfo.getOrderStatus();
+                if(orderStatus.intValue() ==1){
+                    orderInfoService.rollbackOrderInfo(orderId);
+                    System.out.println("取消订单:" + content);
+                }
             }
 
         }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppController.java

@@ -69,7 +69,6 @@ public class WechatAppController extends BaseController {
             return responseSuccess(new ResultVO(1, "请输入code错误!"));
         }
         try {
-
             // 获取微信用户session
             WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(request.getCode());
             if (null == session) {
@@ -98,6 +97,18 @@ public class WechatAppController extends BaseController {
         }
     }
 
+    /**
+     * 登陆接口
+     */
+    @PostMapping("/login/test")
+    @ResponseBody
+    public ResponseBase login(@RequestBody MyWxMpUser myWxMpUser) {
+            //后台新增用户成功
+            Map<String, String> tokenMap = customerInfoService.wxlogin(myWxMpUser);
+            //登录系统获取本地
+            return resultVOSuccess(tokenMap);
+    }
+
     private Map<String, Object> getStringObjectMap(String customerId) {
         CustomerInfoForm customerInfoForm = customerInfoService.queryByPrimaryKey(customerId);
         CustomerInfo data = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);

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

@@ -358,15 +358,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 BigDecimal saleCarbon = bean.getSaleNum();
                 String goodsGuid = bean.getFkGoodsGuid();
                 GoodsSaleInfoForm goodsSaleInfoForm = orderSaleInfoService.getGoodsSaleInfoByGoodsId(goodsGuid);
-                BigDecimal saledCarbonSkin = goodsSaleInfoForm.getSaledCarbonSkin().subtract(saleCarbon);
-                BigDecimal unSaleCarbonSkin = goodsSaleInfoForm.getUnsaledCarbonSkin().add(saleCarbon);
-                goodsSaleInfoForm.setSaledCarbonSkin(saledCarbonSkin);
-                goodsSaleInfoForm.setUnsaledCarbonSkin(unSaleCarbonSkin);
-                goodsSaleInfoForm.setModifiedTime(new Date());
-                int h = orderSaleInfoService.modifiedOrderSaleInfo(goodsSaleInfoForm);
-                if (h == 0) {
-                    throw new RuntimeException();
+                if(!StringUtils.isEmpty(goodsSaleInfoForm)){
+                    BigDecimal saledCarbonSkin = goodsSaleInfoForm.getSaledCarbonSkin().subtract(saleCarbon);
+                    BigDecimal unSaleCarbonSkin = goodsSaleInfoForm.getUnsaledCarbonSkin().add(saleCarbon);
+                    goodsSaleInfoForm.setSaledCarbonSkin(saledCarbonSkin);
+                    goodsSaleInfoForm.setUnsaledCarbonSkin(unSaleCarbonSkin);
+                    goodsSaleInfoForm.setModifiedTime(new Date());
+                    int h = orderSaleInfoService.modifiedOrderSaleInfo(goodsSaleInfoForm);
+                    if (h == 0) {
+                        throw new RuntimeException();
+                    }
                 }
+
             }
         }
         //取消离线支付订单
@@ -539,7 +542,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             //购买的碳汇量
             BigDecimal carbonVal = good.getCarbonVal();
             GoodsInfo goodsInfo = goodsInfoMapper.selectByPrimaryKey(goodsId);
-            String guid = goodsInfo.getGuid();
+            String goodsInfoGuid = goodsInfo.getGuid();
             //还剩碳汇量
             BigDecimal carbonValRe = goodsInfo.getCarbonVal();
             if (StringUtils.isEmpty(carbonValRe)) {
@@ -556,10 +559,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             sumTotal = sumTotal.add(sum);
 
             carbonTotal = carbonTotal.add(carbonVal);
-            //剩余碳汇量
-            BigDecimal reCarbonVal = carbonValRe.subtract(carbonVal);
-            goodsInfo.setCarbonVal(reCarbonVal);
-            goodsInfoMapper.updateByPrimaryKeySelective(goodsInfo);
+//            //剩余碳汇量
+//            BigDecimal reCarbonVal = carbonValRe.subtract(carbonVal);
+//            goodsInfo.setCarbonVal(reCarbonVal);
+//            goodsInfoMapper.updateByPrimaryKeySelective(goodsInfo);
+
+            updateGoods(carbonVal,goodsInfoGuid);
 
             //获取小订单
             addGoodsOrderDetail(customerId, orderId, dataList, good, goodsInfo, sum);
@@ -572,7 +577,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         //新增小定单
         goodsOrderDetailMapper.batchSaveOrderDetailList(dataList);
 
-        String message = "order-" + goodsOrderInfo.getGuid();
+        String message = "order-" +orderId;
         //延时消息队列
         messageService.send(MQConstant.HELLO_QUEUE_NAME, message, 60000);
         return goodsOrderInfo;

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/CustomerInfoMapper.xml

@@ -27,7 +27,7 @@
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    guid, account, passwd, customer_type, customer_name, nick_name, pid, phone, sex, 
+    guid, account, passwd, customer_type, customer_name, nick_name, pid, phone, sex,
     score, wx_id, union_id,head_image,is_company, is_validate, is_enable, state, create_user, create_time,
     modified_user, modified_time
   </sql>
@@ -37,71 +37,71 @@
     aa.create_time,aa.modified_user, aa.modified_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_customer_info
     where guid = #{guid,jdbcType=CHAR}
   </select>
-    <select id="searchCustomerByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
-            resultType="com.hcloud.microserver.h5.bo.CustomerInfoBO">
-      SELECT
-          aa.guid,
-          aa.account AS account,
-          aa.customer_name AS customerName,
-          CASE aa.customer_type
-      WHEN 1 THEN
-          '自然人'
-      WHEN 2 THEN
-          '履约企业'
-      ELSE
-          '非履约企业'
-      END AS customerType,
-       aa.is_company AS isCompany,
-       aa.is_validate AS isValidate,
-       aa.nick_name AS nickName,
-       aa.phone AS customerPhone,
-       aa.pid AS pid,
-       aa.score AS score,
-       aa.create_time as createTime,
-       aa.modified_time as modifiedTime,
-       aa.is_enable as isEnable,
-       aa.wx_id as wxId,
-       aa.phone,
-       CASE aa.sex
-      WHEN 1 THEN
-          '男'
-      ELSE
-          '女'
-      END AS sexName,
-       bb.company_name AS companyName,
-       bb.principals AS principals,
-       bb.phone AS companyPhone
-      FROM
-          t_customer_info aa
-      LEFT JOIN t_customer_company_info bb ON aa.guid = bb.fk_customer_id
-      <where>
-        aa.state = 1
-        <if test="data.customerName != null and data.customerName != ''">
-          and aa.customer_name like concat('%',#{data.customerName},'%')
-        </if>
-        <if test="data.phone != null and data.phone != ''">
-          and aa.phone like concat('%',#{data.phone},'%')
-        </if>
-        <if test="data.account != null and data.account != ''">
-          and aa.account like concat('%', #{data.account}, '%')
-        </if>
-        <if test="data.customerType != null">
-          and aa.customer_type = #{data.customerType}
-        </if>
-        <if test="data.isValidate != null">
-          and aa.is_validate = #{data.isValidate}
-        </if>
-      </where>
-        order by aa.modified_time desc
-    </select>
+  <select id="searchCustomerByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
+          resultType="com.hcloud.microserver.h5.bo.CustomerInfoBO">
+    SELECT
+    aa.guid,
+    aa.account AS account,
+    aa.customer_name AS customerName,
+    CASE aa.customer_type
+    WHEN 1 THEN
+    '自然人'
+    WHEN 2 THEN
+    '履约企业'
+    ELSE
+    '非履约企业'
+    END AS customerType,
+    aa.is_company AS isCompany,
+    aa.is_validate AS isValidate,
+    aa.nick_name AS nickName,
+    aa.phone AS customerPhone,
+    aa.pid AS pid,
+    aa.score AS score,
+    aa.create_time as createTime,
+    aa.modified_time as modifiedTime,
+    aa.is_enable as isEnable,
+    aa.wx_id as wxId,
+    aa.phone,
+    CASE aa.sex
+    WHEN 1 THEN
+    '男'
+    ELSE
+    '女'
+    END AS sexName,
+    bb.company_name AS companyName,
+    bb.principals AS principals,
+    bb.phone AS companyPhone
+    FROM
+    t_customer_info aa
+    LEFT JOIN t_customer_company_info bb ON aa.guid = bb.fk_customer_id
+    <where>
+      aa.state = 1
+      <if test="data.customerName != null and data.customerName != ''">
+        and aa.customer_name like concat('%',#{data.customerName},'%')
+      </if>
+      <if test="data.phone != null and data.phone != ''">
+        and aa.phone like concat('%',#{data.phone},'%')
+      </if>
+      <if test="data.account != null and data.account != ''">
+        and aa.account like concat('%', #{data.account}, '%')
+      </if>
+      <if test="data.customerType != null">
+        and aa.customer_type = #{data.customerType}
+      </if>
+      <if test="data.isValidate != null">
+        and aa.is_validate = #{data.isValidate}
+      </if>
+    </where>
+    order by aa.modified_time desc
+  </select>
   <select id="searchCustomerByAccount" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
-      <include refid="Base_Column_List" />
+    <include refid="Base_Column_List" />
     from t_customer_info
     where account = #{account,jdbcType=CHAR} limit 1
   </select>
@@ -110,7 +110,7 @@
     <include refid="Base_Column_List" />
     from t_customer_info
     where
-      state =1
+    state =1
     and (account=#{queryStr,jdbcType=VARCHAR} or phone=#{queryStr,jdbcType=VARCHAR})
   </select>
   <select id="getCustomerByThreeCode" resultType="com.hcloud.microserver.h5.bo.CustomerInfoBO">
@@ -164,8 +164,8 @@
       FROM
           t_customer_info a
       WHERE
-          a.wx_id = #{MyWxMpUser.openId}
-      OR a.union_id =  #{MyWxMpUser.unionId}
+          a.wx_id = #{myWxMpUser.openId}
+      OR a.union_id = #{myWxMpUser.unionId}
       LIMIT 1
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -173,19 +173,19 @@
   where guid = #{guid,jdbcType=CHAR}
   </delete>
   <insert id="insert" parameterType="CustomerInfo">
-    insert into t_customer_info (guid, account, passwd, 
-      customer_type, customer_name, nick_name, 
-      pid, phone, sex, score, 
+    insert into t_customer_info (guid, account, passwd,
+      customer_type, customer_name, nick_name,
+      pid, phone, sex, score,
       wx_id, union_id,head_image, is_company,
-      is_validate, is_enable, state, 
-      create_user, create_time, modified_user, 
+      is_validate, is_enable, state,
+      create_user, create_time, modified_user,
       modified_time)
-    values (#{guid,jdbcType=CHAR}, #{account,jdbcType=VARCHAR}, #{passwd,jdbcType=VARCHAR}, 
-      #{customerType,jdbcType=INTEGER}, #{customerName,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, 
-      #{pid,jdbcType=CHAR}, #{phone,jdbcType=CHAR}, #{sex,jdbcType=INTEGER}, #{score,jdbcType=INTEGER}, 
+    values (#{guid,jdbcType=CHAR}, #{account,jdbcType=VARCHAR}, #{passwd,jdbcType=VARCHAR},
+      #{customerType,jdbcType=INTEGER}, #{customerName,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR},
+      #{pid,jdbcType=CHAR}, #{phone,jdbcType=CHAR}, #{sex,jdbcType=INTEGER}, #{score,jdbcType=INTEGER},
       #{wxId,jdbcType=VARCHAR}, #{unionId,jdbcType=VARCHAR},#{headImage,jdbcType=VARCHAR},#{isCompany,jdbcType=INTEGER},
-      #{isValidate,jdbcType=INTEGER}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
-      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
+      #{isValidate,jdbcType=INTEGER}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER},
+      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR},
       #{modifiedTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="CustomerInfo">

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

@@ -1,2 +1,3 @@
-##订单详情表新增
-ALTER TABLE t_goods_order_detail ADD COLUMN `carbon_val` decimal(10,2) DEFAULT NULL COMMENT '碳汇量' AFTER `amount`;
+
+#修改商品表is_sale字段备注
+ALTER TABLE `t_goods_info` MODIFY COLUMN  `is_sale` int(11) DEFAULT NULL COMMENT '0 下线 1 上线',