1

service/src/main/java/com/hfkj/dao/CyymallAddressMapper.java

@@ -0,0 +1,84 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallAddress;
+import com.hfkj.entity.CyymallAddressExample;
+import java.util.List;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface CyymallAddressMapper extends CyymallAddressMapperExt {
+    @SelectProvider(type=CyymallAddressSqlProvider.class, method="countByExample")
+    long countByExample(CyymallAddressExample example);
+
+    @DeleteProvider(type=CyymallAddressSqlProvider.class, method="deleteByExample")
+    int deleteByExample(CyymallAddressExample example);
+
+    @Insert({
+        "insert into cyymall_address (store_id, user_id, ",
+        "`name`, mobile, province_id, ",
+        "province, city_id, ",
+        "city, district_id, ",
+        "district, detail, ",
+        "is_default, addtime, ",
+        "is_delete, latitude, ",
+        "longitude)",
+        "values (#{storeId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, ",
+        "#{name,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{provinceId,jdbcType=INTEGER}, ",
+        "#{province,jdbcType=VARCHAR}, #{cityId,jdbcType=INTEGER}, ",
+        "#{city,jdbcType=VARCHAR}, #{districtId,jdbcType=INTEGER}, ",
+        "#{district,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR}, ",
+        "#{isDefault,jdbcType=SMALLINT}, #{addtime,jdbcType=INTEGER}, ",
+        "#{isDelete,jdbcType=SMALLINT}, #{latitude,jdbcType=VARCHAR}, ",
+        "#{longitude,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(CyymallAddress record);
+
+    @InsertProvider(type=CyymallAddressSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(CyymallAddress record);
+
+    @SelectProvider(type=CyymallAddressSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
+        @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER),
+        @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
+        @Result(column="mobile", property="mobile", jdbcType=JdbcType.VARCHAR),
+        @Result(column="province_id", property="provinceId", jdbcType=JdbcType.INTEGER),
+        @Result(column="province", property="province", jdbcType=JdbcType.VARCHAR),
+        @Result(column="city_id", property="cityId", jdbcType=JdbcType.INTEGER),
+        @Result(column="city", property="city", jdbcType=JdbcType.VARCHAR),
+        @Result(column="district_id", property="districtId", jdbcType=JdbcType.INTEGER),
+        @Result(column="district", property="district", jdbcType=JdbcType.VARCHAR),
+        @Result(column="detail", property="detail", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_default", property="isDefault", jdbcType=JdbcType.SMALLINT),
+        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
+        @Result(column="latitude", property="latitude", jdbcType=JdbcType.VARCHAR),
+        @Result(column="longitude", property="longitude", jdbcType=JdbcType.VARCHAR)
+    })
+    List<CyymallAddress> selectByExample(CyymallAddressExample example);
+
+    @UpdateProvider(type=CyymallAddressSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") CyymallAddress record, @Param("example") CyymallAddressExample example);
+
+    @UpdateProvider(type=CyymallAddressSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") CyymallAddress record, @Param("example") CyymallAddressExample example);
+}

service/src/main/java/com/hfkj/dao/CyymallAddressMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface CyymallAddressMapperExt {
+}

service/src/main/java/com/hfkj/dao/CyymallAddressSqlProvider.java

@@ -0,0 +1,329 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallAddress;
+import com.hfkj.entity.CyymallAddressExample.Criteria;
+import com.hfkj.entity.CyymallAddressExample.Criterion;
+import com.hfkj.entity.CyymallAddressExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CyymallAddressSqlProvider {
+
+    public String countByExample(CyymallAddressExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("cyymall_address");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(CyymallAddressExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("cyymall_address");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(CyymallAddress record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("cyymall_address");
+        
+        if (record.getStoreId() != null) {
+            sql.VALUES("store_id", "#{storeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.VALUES("user_id", "#{userId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getName() != null) {
+            sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMobile() != null) {
+            sql.VALUES("mobile", "#{mobile,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getProvinceId() != null) {
+            sql.VALUES("province_id", "#{provinceId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getProvince() != null) {
+            sql.VALUES("province", "#{province,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCityId() != null) {
+            sql.VALUES("city_id", "#{cityId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCity() != null) {
+            sql.VALUES("city", "#{city,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getDistrictId() != null) {
+            sql.VALUES("district_id", "#{districtId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDistrict() != null) {
+            sql.VALUES("district", "#{district,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getDetail() != null) {
+            sql.VALUES("detail", "#{detail,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsDefault() != null) {
+            sql.VALUES("is_default", "#{isDefault,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.VALUES("addtime", "#{addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.VALUES("is_delete", "#{isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getLatitude() != null) {
+            sql.VALUES("latitude", "#{latitude,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getLongitude() != null) {
+            sql.VALUES("longitude", "#{longitude,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(CyymallAddressExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("store_id");
+        sql.SELECT("user_id");
+        sql.SELECT("`name`");
+        sql.SELECT("mobile");
+        sql.SELECT("province_id");
+        sql.SELECT("province");
+        sql.SELECT("city_id");
+        sql.SELECT("city");
+        sql.SELECT("district_id");
+        sql.SELECT("district");
+        sql.SELECT("detail");
+        sql.SELECT("is_default");
+        sql.SELECT("addtime");
+        sql.SELECT("is_delete");
+        sql.SELECT("latitude");
+        sql.SELECT("longitude");
+        sql.FROM("cyymall_address");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        CyymallAddress record = (CyymallAddress) parameter.get("record");
+        CyymallAddressExample example = (CyymallAddressExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_address");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStoreId() != null) {
+            sql.SET("store_id = #{record.storeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{record.userId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getName() != null) {
+            sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMobile() != null) {
+            sql.SET("mobile = #{record.mobile,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getProvinceId() != null) {
+            sql.SET("province_id = #{record.provinceId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getProvince() != null) {
+            sql.SET("province = #{record.province,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCityId() != null) {
+            sql.SET("city_id = #{record.cityId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCity() != null) {
+            sql.SET("city = #{record.city,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getDistrictId() != null) {
+            sql.SET("district_id = #{record.districtId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDistrict() != null) {
+            sql.SET("district = #{record.district,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getDetail() != null) {
+            sql.SET("detail = #{record.detail,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsDefault() != null) {
+            sql.SET("is_default = #{record.isDefault,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getLatitude() != null) {
+            sql.SET("latitude = #{record.latitude,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getLongitude() != null) {
+            sql.SET("longitude = #{record.longitude,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_address");
+        
+        sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        sql.SET("store_id = #{record.storeId,jdbcType=INTEGER}");
+        sql.SET("user_id = #{record.userId,jdbcType=INTEGER}");
+        sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
+        sql.SET("mobile = #{record.mobile,jdbcType=VARCHAR}");
+        sql.SET("province_id = #{record.provinceId,jdbcType=INTEGER}");
+        sql.SET("province = #{record.province,jdbcType=VARCHAR}");
+        sql.SET("city_id = #{record.cityId,jdbcType=INTEGER}");
+        sql.SET("city = #{record.city,jdbcType=VARCHAR}");
+        sql.SET("district_id = #{record.districtId,jdbcType=INTEGER}");
+        sql.SET("district = #{record.district,jdbcType=VARCHAR}");
+        sql.SET("detail = #{record.detail,jdbcType=VARCHAR}");
+        sql.SET("is_default = #{record.isDefault,jdbcType=SMALLINT}");
+        sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        sql.SET("latitude = #{record.latitude,jdbcType=VARCHAR}");
+        sql.SET("longitude = #{record.longitude,jdbcType=VARCHAR}");
+        
+        CyymallAddressExample example = (CyymallAddressExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, CyymallAddressExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/CyymallGoodsMapper.java

@@ -0,0 +1,255 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallGoods;
+import com.hfkj.entity.CyymallGoodsExample;
+import com.hfkj.entity.CyymallGoodsWithBLOBs;
+import java.util.List;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface CyymallGoodsMapper extends CyymallGoodsMapperExt {
+    @SelectProvider(type=CyymallGoodsSqlProvider.class, method="countByExample")
+    long countByExample(CyymallGoodsExample example);
+
+    @DeleteProvider(type=CyymallGoodsSqlProvider.class, method="deleteByExample")
+    int deleteByExample(CyymallGoodsExample example);
+
+    @Insert({
+        "insert into cyymall_goods (store_id, `name`, ",
+        "price, original_price, ",
+        "cat_id, `status`, ",
+        "addtime, is_delete, ",
+        "service, sort, virtual_sales, ",
+        "video_url, unit, ",
+        "individual_share, share_commission_first, ",
+        "share_commission_second, share_commission_third, ",
+        "weight, freight, ",
+        "use_attr, share_type, ",
+        "quick_purchase, hot_cakes, ",
+        "cost_price, member_discount, ",
+        "rebate, mch_id, goods_num, ",
+        "mch_sort, confine_count, ",
+        "is_level, `type`, ",
+        "is_negotiable, attr_setting_type, ",
+        "views, supplier_price, ",
+        "supplier_goods_id, supplier_id, ",
+        "goods_share_title, goods_share_logo, ",
+        "goods_share_desc, is_examine, ",
+        "dabao_price, brand_id, ",
+        "key_word, buying_method, ",
+        "buying_method_level, home_block_id, ",
+        "new_individual_share, new_attr_setting_type, ",
+        "share_commission_base, is_sjht, ",
+        "sjht_proIdent, is_oil, ",
+        "oil_couTypeCode, is_abholung, ",
+        "is_transnational, goods_transfer_rate, ",
+        "oil_discount, oil_type, ",
+        "detail, attr, ",
+        "cover_pic, full_cut, ",
+        "integral, shop_id, ",
+        "verify_card_id)",
+        "values (#{storeId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, ",
+        "#{price,jdbcType=DECIMAL}, #{originalPrice,jdbcType=DECIMAL}, ",
+        "#{catId,jdbcType=INTEGER}, #{status,jdbcType=SMALLINT}, ",
+        "#{addtime,jdbcType=INTEGER}, #{isDelete,jdbcType=SMALLINT}, ",
+        "#{service,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{virtualSales,jdbcType=INTEGER}, ",
+        "#{videoUrl,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, ",
+        "#{individualShare,jdbcType=SMALLINT}, #{shareCommissionFirst,jdbcType=DECIMAL}, ",
+        "#{shareCommissionSecond,jdbcType=DECIMAL}, #{shareCommissionThird,jdbcType=DECIMAL}, ",
+        "#{weight,jdbcType=DOUBLE}, #{freight,jdbcType=INTEGER}, ",
+        "#{useAttr,jdbcType=SMALLINT}, #{shareType,jdbcType=INTEGER}, ",
+        "#{quickPurchase,jdbcType=SMALLINT}, #{hotCakes,jdbcType=SMALLINT}, ",
+        "#{costPrice,jdbcType=DECIMAL}, #{memberDiscount,jdbcType=SMALLINT}, ",
+        "#{rebate,jdbcType=DECIMAL}, #{mchId,jdbcType=INTEGER}, #{goodsNum,jdbcType=INTEGER}, ",
+        "#{mchSort,jdbcType=INTEGER}, #{confineCount,jdbcType=INTEGER}, ",
+        "#{isLevel,jdbcType=SMALLINT}, #{type,jdbcType=SMALLINT}, ",
+        "#{isNegotiable,jdbcType=SMALLINT}, #{attrSettingType,jdbcType=BIT}, ",
+        "#{views,jdbcType=BIGINT}, #{supplierPrice,jdbcType=DECIMAL}, ",
+        "#{supplierGoodsId,jdbcType=INTEGER}, #{supplierId,jdbcType=INTEGER}, ",
+        "#{goodsShareTitle,jdbcType=VARCHAR}, #{goodsShareLogo,jdbcType=VARCHAR}, ",
+        "#{goodsShareDesc,jdbcType=VARCHAR}, #{isExamine,jdbcType=INTEGER}, ",
+        "#{dabaoPrice,jdbcType=DECIMAL}, #{brandId,jdbcType=INTEGER}, ",
+        "#{keyWord,jdbcType=VARCHAR}, #{buyingMethod,jdbcType=INTEGER}, ",
+        "#{buyingMethodLevel,jdbcType=INTEGER}, #{homeBlockId,jdbcType=INTEGER}, ",
+        "#{newIndividualShare,jdbcType=INTEGER}, #{newAttrSettingType,jdbcType=INTEGER}, ",
+        "#{shareCommissionBase,jdbcType=DECIMAL}, #{isSjht,jdbcType=SMALLINT}, ",
+        "#{sjhtProident,jdbcType=VARCHAR}, #{isOil,jdbcType=SMALLINT}, ",
+        "#{oilCoutypecode,jdbcType=VARCHAR}, #{isAbholung,jdbcType=SMALLINT}, ",
+        "#{isTransnational,jdbcType=SMALLINT}, #{goodsTransferRate,jdbcType=INTEGER}, ",
+        "#{oilDiscount,jdbcType=INTEGER}, #{oilType,jdbcType=INTEGER}, ",
+        "#{detail,jdbcType=LONGVARCHAR}, #{attr,jdbcType=LONGVARCHAR}, ",
+        "#{coverPic,jdbcType=LONGVARCHAR}, #{fullCut,jdbcType=LONGVARCHAR}, ",
+        "#{integral,jdbcType=LONGVARCHAR}, #{shopId,jdbcType=LONGVARCHAR}, ",
+        "#{verifyCardId,jdbcType=LONGVARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(CyymallGoodsWithBLOBs record);
+
+    @InsertProvider(type=CyymallGoodsSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(CyymallGoodsWithBLOBs record);
+
+    @SelectProvider(type=CyymallGoodsSqlProvider.class, method="selectByExampleWithBLOBs")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
+        @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
+        @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="original_price", property="originalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="cat_id", property="catId", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.SMALLINT),
+        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
+        @Result(column="service", property="service", jdbcType=JdbcType.VARCHAR),
+        @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
+        @Result(column="virtual_sales", property="virtualSales", jdbcType=JdbcType.INTEGER),
+        @Result(column="video_url", property="videoUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="unit", property="unit", jdbcType=JdbcType.VARCHAR),
+        @Result(column="individual_share", property="individualShare", jdbcType=JdbcType.SMALLINT),
+        @Result(column="share_commission_first", property="shareCommissionFirst", jdbcType=JdbcType.DECIMAL),
+        @Result(column="share_commission_second", property="shareCommissionSecond", jdbcType=JdbcType.DECIMAL),
+        @Result(column="share_commission_third", property="shareCommissionThird", jdbcType=JdbcType.DECIMAL),
+        @Result(column="weight", property="weight", jdbcType=JdbcType.DOUBLE),
+        @Result(column="freight", property="freight", jdbcType=JdbcType.INTEGER),
+        @Result(column="use_attr", property="useAttr", jdbcType=JdbcType.SMALLINT),
+        @Result(column="share_type", property="shareType", jdbcType=JdbcType.INTEGER),
+        @Result(column="quick_purchase", property="quickPurchase", jdbcType=JdbcType.SMALLINT),
+        @Result(column="hot_cakes", property="hotCakes", jdbcType=JdbcType.SMALLINT),
+        @Result(column="cost_price", property="costPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="member_discount", property="memberDiscount", jdbcType=JdbcType.SMALLINT),
+        @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL),
+        @Result(column="mch_id", property="mchId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_num", property="goodsNum", jdbcType=JdbcType.INTEGER),
+        @Result(column="mch_sort", property="mchSort", jdbcType=JdbcType.INTEGER),
+        @Result(column="confine_count", property="confineCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_level", property="isLevel", jdbcType=JdbcType.SMALLINT),
+        @Result(column="type", property="type", jdbcType=JdbcType.SMALLINT),
+        @Result(column="is_negotiable", property="isNegotiable", jdbcType=JdbcType.SMALLINT),
+        @Result(column="attr_setting_type", property="attrSettingType", jdbcType=JdbcType.BIT),
+        @Result(column="views", property="views", jdbcType=JdbcType.BIGINT),
+        @Result(column="supplier_price", property="supplierPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="supplier_goods_id", property="supplierGoodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="supplier_id", property="supplierId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_share_title", property="goodsShareTitle", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_share_logo", property="goodsShareLogo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_share_desc", property="goodsShareDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_examine", property="isExamine", jdbcType=JdbcType.INTEGER),
+        @Result(column="dabao_price", property="dabaoPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
+        @Result(column="key_word", property="keyWord", jdbcType=JdbcType.VARCHAR),
+        @Result(column="buying_method", property="buyingMethod", jdbcType=JdbcType.INTEGER),
+        @Result(column="buying_method_level", property="buyingMethodLevel", jdbcType=JdbcType.INTEGER),
+        @Result(column="home_block_id", property="homeBlockId", jdbcType=JdbcType.INTEGER),
+        @Result(column="new_individual_share", property="newIndividualShare", jdbcType=JdbcType.INTEGER),
+        @Result(column="new_attr_setting_type", property="newAttrSettingType", jdbcType=JdbcType.INTEGER),
+        @Result(column="share_commission_base", property="shareCommissionBase", jdbcType=JdbcType.DECIMAL),
+        @Result(column="is_sjht", property="isSjht", jdbcType=JdbcType.SMALLINT),
+        @Result(column="sjht_proIdent", property="sjhtProident", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_oil", property="isOil", jdbcType=JdbcType.SMALLINT),
+        @Result(column="oil_couTypeCode", property="oilCoutypecode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_abholung", property="isAbholung", jdbcType=JdbcType.SMALLINT),
+        @Result(column="is_transnational", property="isTransnational", jdbcType=JdbcType.SMALLINT),
+        @Result(column="goods_transfer_rate", property="goodsTransferRate", jdbcType=JdbcType.INTEGER),
+        @Result(column="oil_discount", property="oilDiscount", jdbcType=JdbcType.INTEGER),
+        @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER),
+        @Result(column="detail", property="detail", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="attr", property="attr", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="cover_pic", property="coverPic", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="full_cut", property="fullCut", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="integral", property="integral", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="shop_id", property="shopId", jdbcType=JdbcType.LONGVARCHAR),
+        @Result(column="verify_card_id", property="verifyCardId", jdbcType=JdbcType.LONGVARCHAR)
+    })
+    List<CyymallGoodsWithBLOBs> selectByExampleWithBLOBs(CyymallGoodsExample example);
+
+    @SelectProvider(type=CyymallGoodsSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
+        @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
+        @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="original_price", property="originalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="cat_id", property="catId", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.SMALLINT),
+        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
+        @Result(column="service", property="service", jdbcType=JdbcType.VARCHAR),
+        @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
+        @Result(column="virtual_sales", property="virtualSales", jdbcType=JdbcType.INTEGER),
+        @Result(column="video_url", property="videoUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="unit", property="unit", jdbcType=JdbcType.VARCHAR),
+        @Result(column="individual_share", property="individualShare", jdbcType=JdbcType.SMALLINT),
+        @Result(column="share_commission_first", property="shareCommissionFirst", jdbcType=JdbcType.DECIMAL),
+        @Result(column="share_commission_second", property="shareCommissionSecond", jdbcType=JdbcType.DECIMAL),
+        @Result(column="share_commission_third", property="shareCommissionThird", jdbcType=JdbcType.DECIMAL),
+        @Result(column="weight", property="weight", jdbcType=JdbcType.DOUBLE),
+        @Result(column="freight", property="freight", jdbcType=JdbcType.INTEGER),
+        @Result(column="use_attr", property="useAttr", jdbcType=JdbcType.SMALLINT),
+        @Result(column="share_type", property="shareType", jdbcType=JdbcType.INTEGER),
+        @Result(column="quick_purchase", property="quickPurchase", jdbcType=JdbcType.SMALLINT),
+        @Result(column="hot_cakes", property="hotCakes", jdbcType=JdbcType.SMALLINT),
+        @Result(column="cost_price", property="costPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="member_discount", property="memberDiscount", jdbcType=JdbcType.SMALLINT),
+        @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL),
+        @Result(column="mch_id", property="mchId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_num", property="goodsNum", jdbcType=JdbcType.INTEGER),
+        @Result(column="mch_sort", property="mchSort", jdbcType=JdbcType.INTEGER),
+        @Result(column="confine_count", property="confineCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_level", property="isLevel", jdbcType=JdbcType.SMALLINT),
+        @Result(column="type", property="type", jdbcType=JdbcType.SMALLINT),
+        @Result(column="is_negotiable", property="isNegotiable", jdbcType=JdbcType.SMALLINT),
+        @Result(column="attr_setting_type", property="attrSettingType", jdbcType=JdbcType.BIT),
+        @Result(column="views", property="views", jdbcType=JdbcType.BIGINT),
+        @Result(column="supplier_price", property="supplierPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="supplier_goods_id", property="supplierGoodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="supplier_id", property="supplierId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_share_title", property="goodsShareTitle", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_share_logo", property="goodsShareLogo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_share_desc", property="goodsShareDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_examine", property="isExamine", jdbcType=JdbcType.INTEGER),
+        @Result(column="dabao_price", property="dabaoPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
+        @Result(column="key_word", property="keyWord", jdbcType=JdbcType.VARCHAR),
+        @Result(column="buying_method", property="buyingMethod", jdbcType=JdbcType.INTEGER),
+        @Result(column="buying_method_level", property="buyingMethodLevel", jdbcType=JdbcType.INTEGER),
+        @Result(column="home_block_id", property="homeBlockId", jdbcType=JdbcType.INTEGER),
+        @Result(column="new_individual_share", property="newIndividualShare", jdbcType=JdbcType.INTEGER),
+        @Result(column="new_attr_setting_type", property="newAttrSettingType", jdbcType=JdbcType.INTEGER),
+        @Result(column="share_commission_base", property="shareCommissionBase", jdbcType=JdbcType.DECIMAL),
+        @Result(column="is_sjht", property="isSjht", jdbcType=JdbcType.SMALLINT),
+        @Result(column="sjht_proIdent", property="sjhtProident", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_oil", property="isOil", jdbcType=JdbcType.SMALLINT),
+        @Result(column="oil_couTypeCode", property="oilCoutypecode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_abholung", property="isAbholung", jdbcType=JdbcType.SMALLINT),
+        @Result(column="is_transnational", property="isTransnational", jdbcType=JdbcType.SMALLINT),
+        @Result(column="goods_transfer_rate", property="goodsTransferRate", jdbcType=JdbcType.INTEGER),
+        @Result(column="oil_discount", property="oilDiscount", jdbcType=JdbcType.INTEGER),
+        @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER)
+    })
+    List<CyymallGoods> selectByExample(CyymallGoodsExample example);
+
+    @UpdateProvider(type=CyymallGoodsSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") CyymallGoodsWithBLOBs record, @Param("example") CyymallGoodsExample example);
+
+    @UpdateProvider(type=CyymallGoodsSqlProvider.class, method="updateByExampleWithBLOBs")
+    int updateByExampleWithBLOBs(@Param("record") CyymallGoodsWithBLOBs record, @Param("example") CyymallGoodsExample example);
+
+    @UpdateProvider(type=CyymallGoodsSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") CyymallGoods record, @Param("example") CyymallGoodsExample example);
+}

service/src/main/java/com/hfkj/dao/CyymallGoodsMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface CyymallGoodsMapperExt {
+}

service/src/main/java/com/hfkj/dao/CyymallGoodsSqlProvider.java

@@ -0,0 +1,987 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallGoodsExample.Criteria;
+import com.hfkj.entity.CyymallGoodsExample.Criterion;
+import com.hfkj.entity.CyymallGoodsExample;
+import com.hfkj.entity.CyymallGoodsWithBLOBs;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CyymallGoodsSqlProvider {
+
+    public String countByExample(CyymallGoodsExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("cyymall_goods");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(CyymallGoodsExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("cyymall_goods");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(CyymallGoodsWithBLOBs record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("cyymall_goods");
+        
+        if (record.getStoreId() != null) {
+            sql.VALUES("store_id", "#{storeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getName() != null) {
+            sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPrice() != null) {
+            sql.VALUES("price", "#{price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getOriginalPrice() != null) {
+            sql.VALUES("original_price", "#{originalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCatId() != null) {
+            sql.VALUES("cat_id", "#{catId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.VALUES("addtime", "#{addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.VALUES("is_delete", "#{isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getService() != null) {
+            sql.VALUES("service", "#{service,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSort() != null) {
+            sql.VALUES("sort", "#{sort,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVirtualSales() != null) {
+            sql.VALUES("virtual_sales", "#{virtualSales,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVideoUrl() != null) {
+            sql.VALUES("video_url", "#{videoUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getUnit() != null) {
+            sql.VALUES("unit", "#{unit,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIndividualShare() != null) {
+            sql.VALUES("individual_share", "#{individualShare,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getShareCommissionFirst() != null) {
+            sql.VALUES("share_commission_first", "#{shareCommissionFirst,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getShareCommissionSecond() != null) {
+            sql.VALUES("share_commission_second", "#{shareCommissionSecond,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getShareCommissionThird() != null) {
+            sql.VALUES("share_commission_third", "#{shareCommissionThird,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getWeight() != null) {
+            sql.VALUES("weight", "#{weight,jdbcType=DOUBLE}");
+        }
+        
+        if (record.getFreight() != null) {
+            sql.VALUES("freight", "#{freight,jdbcType=INTEGER}");
+        }
+        
+        if (record.getUseAttr() != null) {
+            sql.VALUES("use_attr", "#{useAttr,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getShareType() != null) {
+            sql.VALUES("share_type", "#{shareType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getQuickPurchase() != null) {
+            sql.VALUES("quick_purchase", "#{quickPurchase,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getHotCakes() != null) {
+            sql.VALUES("hot_cakes", "#{hotCakes,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getCostPrice() != null) {
+            sql.VALUES("cost_price", "#{costPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getMemberDiscount() != null) {
+            sql.VALUES("member_discount", "#{memberDiscount,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getRebate() != null) {
+            sql.VALUES("rebate", "#{rebate,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getMchId() != null) {
+            sql.VALUES("mch_id", "#{mchId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsNum() != null) {
+            sql.VALUES("goods_num", "#{goodsNum,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMchSort() != null) {
+            sql.VALUES("mch_sort", "#{mchSort,jdbcType=INTEGER}");
+        }
+        
+        if (record.getConfineCount() != null) {
+            sql.VALUES("confine_count", "#{confineCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsLevel() != null) {
+            sql.VALUES("is_level", "#{isLevel,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getType() != null) {
+            sql.VALUES("`type`", "#{type,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getIsNegotiable() != null) {
+            sql.VALUES("is_negotiable", "#{isNegotiable,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAttrSettingType() != null) {
+            sql.VALUES("attr_setting_type", "#{attrSettingType,jdbcType=BIT}");
+        }
+        
+        if (record.getViews() != null) {
+            sql.VALUES("views", "#{views,jdbcType=BIGINT}");
+        }
+        
+        if (record.getSupplierPrice() != null) {
+            sql.VALUES("supplier_price", "#{supplierPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSupplierGoodsId() != null) {
+            sql.VALUES("supplier_goods_id", "#{supplierGoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getSupplierId() != null) {
+            sql.VALUES("supplier_id", "#{supplierId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsShareTitle() != null) {
+            sql.VALUES("goods_share_title", "#{goodsShareTitle,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsShareLogo() != null) {
+            sql.VALUES("goods_share_logo", "#{goodsShareLogo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsShareDesc() != null) {
+            sql.VALUES("goods_share_desc", "#{goodsShareDesc,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsExamine() != null) {
+            sql.VALUES("is_examine", "#{isExamine,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDabaoPrice() != null) {
+            sql.VALUES("dabao_price", "#{dabaoPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getBrandId() != null) {
+            sql.VALUES("brand_id", "#{brandId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getKeyWord() != null) {
+            sql.VALUES("key_word", "#{keyWord,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBuyingMethod() != null) {
+            sql.VALUES("buying_method", "#{buyingMethod,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBuyingMethodLevel() != null) {
+            sql.VALUES("buying_method_level", "#{buyingMethodLevel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getHomeBlockId() != null) {
+            sql.VALUES("home_block_id", "#{homeBlockId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNewIndividualShare() != null) {
+            sql.VALUES("new_individual_share", "#{newIndividualShare,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNewAttrSettingType() != null) {
+            sql.VALUES("new_attr_setting_type", "#{newAttrSettingType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getShareCommissionBase() != null) {
+            sql.VALUES("share_commission_base", "#{shareCommissionBase,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIsSjht() != null) {
+            sql.VALUES("is_sjht", "#{isSjht,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getSjhtProident() != null) {
+            sql.VALUES("sjht_proIdent", "#{sjhtProident,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsOil() != null) {
+            sql.VALUES("is_oil", "#{isOil,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getOilCoutypecode() != null) {
+            sql.VALUES("oil_couTypeCode", "#{oilCoutypecode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsAbholung() != null) {
+            sql.VALUES("is_abholung", "#{isAbholung,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getIsTransnational() != null) {
+            sql.VALUES("is_transnational", "#{isTransnational,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getGoodsTransferRate() != null) {
+            sql.VALUES("goods_transfer_rate", "#{goodsTransferRate,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOilDiscount() != null) {
+            sql.VALUES("oil_discount", "#{oilDiscount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOilType() != null) {
+            sql.VALUES("oil_type", "#{oilType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDetail() != null) {
+            sql.VALUES("detail", "#{detail,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getAttr() != null) {
+            sql.VALUES("attr", "#{attr,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getCoverPic() != null) {
+            sql.VALUES("cover_pic", "#{coverPic,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getFullCut() != null) {
+            sql.VALUES("full_cut", "#{fullCut,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getIntegral() != null) {
+            sql.VALUES("integral", "#{integral,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getShopId() != null) {
+            sql.VALUES("shop_id", "#{shopId,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getVerifyCardId() != null) {
+            sql.VALUES("verify_card_id", "#{verifyCardId,jdbcType=LONGVARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExampleWithBLOBs(CyymallGoodsExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("store_id");
+        sql.SELECT("`name`");
+        sql.SELECT("price");
+        sql.SELECT("original_price");
+        sql.SELECT("cat_id");
+        sql.SELECT("`status`");
+        sql.SELECT("addtime");
+        sql.SELECT("is_delete");
+        sql.SELECT("service");
+        sql.SELECT("sort");
+        sql.SELECT("virtual_sales");
+        sql.SELECT("video_url");
+        sql.SELECT("unit");
+        sql.SELECT("individual_share");
+        sql.SELECT("share_commission_first");
+        sql.SELECT("share_commission_second");
+        sql.SELECT("share_commission_third");
+        sql.SELECT("weight");
+        sql.SELECT("freight");
+        sql.SELECT("use_attr");
+        sql.SELECT("share_type");
+        sql.SELECT("quick_purchase");
+        sql.SELECT("hot_cakes");
+        sql.SELECT("cost_price");
+        sql.SELECT("member_discount");
+        sql.SELECT("rebate");
+        sql.SELECT("mch_id");
+        sql.SELECT("goods_num");
+        sql.SELECT("mch_sort");
+        sql.SELECT("confine_count");
+        sql.SELECT("is_level");
+        sql.SELECT("`type`");
+        sql.SELECT("is_negotiable");
+        sql.SELECT("attr_setting_type");
+        sql.SELECT("views");
+        sql.SELECT("supplier_price");
+        sql.SELECT("supplier_goods_id");
+        sql.SELECT("supplier_id");
+        sql.SELECT("goods_share_title");
+        sql.SELECT("goods_share_logo");
+        sql.SELECT("goods_share_desc");
+        sql.SELECT("is_examine");
+        sql.SELECT("dabao_price");
+        sql.SELECT("brand_id");
+        sql.SELECT("key_word");
+        sql.SELECT("buying_method");
+        sql.SELECT("buying_method_level");
+        sql.SELECT("home_block_id");
+        sql.SELECT("new_individual_share");
+        sql.SELECT("new_attr_setting_type");
+        sql.SELECT("share_commission_base");
+        sql.SELECT("is_sjht");
+        sql.SELECT("sjht_proIdent");
+        sql.SELECT("is_oil");
+        sql.SELECT("oil_couTypeCode");
+        sql.SELECT("is_abholung");
+        sql.SELECT("is_transnational");
+        sql.SELECT("goods_transfer_rate");
+        sql.SELECT("oil_discount");
+        sql.SELECT("oil_type");
+        sql.SELECT("detail");
+        sql.SELECT("attr");
+        sql.SELECT("cover_pic");
+        sql.SELECT("full_cut");
+        sql.SELECT("integral");
+        sql.SELECT("shop_id");
+        sql.SELECT("verify_card_id");
+        sql.FROM("cyymall_goods");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(CyymallGoodsExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("store_id");
+        sql.SELECT("`name`");
+        sql.SELECT("price");
+        sql.SELECT("original_price");
+        sql.SELECT("cat_id");
+        sql.SELECT("`status`");
+        sql.SELECT("addtime");
+        sql.SELECT("is_delete");
+        sql.SELECT("service");
+        sql.SELECT("sort");
+        sql.SELECT("virtual_sales");
+        sql.SELECT("video_url");
+        sql.SELECT("unit");
+        sql.SELECT("individual_share");
+        sql.SELECT("share_commission_first");
+        sql.SELECT("share_commission_second");
+        sql.SELECT("share_commission_third");
+        sql.SELECT("weight");
+        sql.SELECT("freight");
+        sql.SELECT("use_attr");
+        sql.SELECT("share_type");
+        sql.SELECT("quick_purchase");
+        sql.SELECT("hot_cakes");
+        sql.SELECT("cost_price");
+        sql.SELECT("member_discount");
+        sql.SELECT("rebate");
+        sql.SELECT("mch_id");
+        sql.SELECT("goods_num");
+        sql.SELECT("mch_sort");
+        sql.SELECT("confine_count");
+        sql.SELECT("is_level");
+        sql.SELECT("`type`");
+        sql.SELECT("is_negotiable");
+        sql.SELECT("attr_setting_type");
+        sql.SELECT("views");
+        sql.SELECT("supplier_price");
+        sql.SELECT("supplier_goods_id");
+        sql.SELECT("supplier_id");
+        sql.SELECT("goods_share_title");
+        sql.SELECT("goods_share_logo");
+        sql.SELECT("goods_share_desc");
+        sql.SELECT("is_examine");
+        sql.SELECT("dabao_price");
+        sql.SELECT("brand_id");
+        sql.SELECT("key_word");
+        sql.SELECT("buying_method");
+        sql.SELECT("buying_method_level");
+        sql.SELECT("home_block_id");
+        sql.SELECT("new_individual_share");
+        sql.SELECT("new_attr_setting_type");
+        sql.SELECT("share_commission_base");
+        sql.SELECT("is_sjht");
+        sql.SELECT("sjht_proIdent");
+        sql.SELECT("is_oil");
+        sql.SELECT("oil_couTypeCode");
+        sql.SELECT("is_abholung");
+        sql.SELECT("is_transnational");
+        sql.SELECT("goods_transfer_rate");
+        sql.SELECT("oil_discount");
+        sql.SELECT("oil_type");
+        sql.FROM("cyymall_goods");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        CyymallGoodsWithBLOBs record = (CyymallGoodsWithBLOBs) parameter.get("record");
+        CyymallGoodsExample example = (CyymallGoodsExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_goods");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStoreId() != null) {
+            sql.SET("store_id = #{record.storeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getName() != null) {
+            sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPrice() != null) {
+            sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getOriginalPrice() != null) {
+            sql.SET("original_price = #{record.originalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCatId() != null) {
+            sql.SET("cat_id = #{record.catId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getService() != null) {
+            sql.SET("service = #{record.service,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSort() != null) {
+            sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVirtualSales() != null) {
+            sql.SET("virtual_sales = #{record.virtualSales,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVideoUrl() != null) {
+            sql.SET("video_url = #{record.videoUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getUnit() != null) {
+            sql.SET("unit = #{record.unit,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIndividualShare() != null) {
+            sql.SET("individual_share = #{record.individualShare,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getShareCommissionFirst() != null) {
+            sql.SET("share_commission_first = #{record.shareCommissionFirst,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getShareCommissionSecond() != null) {
+            sql.SET("share_commission_second = #{record.shareCommissionSecond,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getShareCommissionThird() != null) {
+            sql.SET("share_commission_third = #{record.shareCommissionThird,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getWeight() != null) {
+            sql.SET("weight = #{record.weight,jdbcType=DOUBLE}");
+        }
+        
+        if (record.getFreight() != null) {
+            sql.SET("freight = #{record.freight,jdbcType=INTEGER}");
+        }
+        
+        if (record.getUseAttr() != null) {
+            sql.SET("use_attr = #{record.useAttr,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getShareType() != null) {
+            sql.SET("share_type = #{record.shareType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getQuickPurchase() != null) {
+            sql.SET("quick_purchase = #{record.quickPurchase,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getHotCakes() != null) {
+            sql.SET("hot_cakes = #{record.hotCakes,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getCostPrice() != null) {
+            sql.SET("cost_price = #{record.costPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getMemberDiscount() != null) {
+            sql.SET("member_discount = #{record.memberDiscount,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getRebate() != null) {
+            sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getMchId() != null) {
+            sql.SET("mch_id = #{record.mchId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsNum() != null) {
+            sql.SET("goods_num = #{record.goodsNum,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMchSort() != null) {
+            sql.SET("mch_sort = #{record.mchSort,jdbcType=INTEGER}");
+        }
+        
+        if (record.getConfineCount() != null) {
+            sql.SET("confine_count = #{record.confineCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsLevel() != null) {
+            sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getType() != null) {
+            sql.SET("`type` = #{record.type,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getIsNegotiable() != null) {
+            sql.SET("is_negotiable = #{record.isNegotiable,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getAttrSettingType() != null) {
+            sql.SET("attr_setting_type = #{record.attrSettingType,jdbcType=BIT}");
+        }
+        
+        if (record.getViews() != null) {
+            sql.SET("views = #{record.views,jdbcType=BIGINT}");
+        }
+        
+        if (record.getSupplierPrice() != null) {
+            sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSupplierGoodsId() != null) {
+            sql.SET("supplier_goods_id = #{record.supplierGoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getSupplierId() != null) {
+            sql.SET("supplier_id = #{record.supplierId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsShareTitle() != null) {
+            sql.SET("goods_share_title = #{record.goodsShareTitle,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsShareLogo() != null) {
+            sql.SET("goods_share_logo = #{record.goodsShareLogo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsShareDesc() != null) {
+            sql.SET("goods_share_desc = #{record.goodsShareDesc,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsExamine() != null) {
+            sql.SET("is_examine = #{record.isExamine,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDabaoPrice() != null) {
+            sql.SET("dabao_price = #{record.dabaoPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getBrandId() != null) {
+            sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getKeyWord() != null) {
+            sql.SET("key_word = #{record.keyWord,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBuyingMethod() != null) {
+            sql.SET("buying_method = #{record.buyingMethod,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBuyingMethodLevel() != null) {
+            sql.SET("buying_method_level = #{record.buyingMethodLevel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getHomeBlockId() != null) {
+            sql.SET("home_block_id = #{record.homeBlockId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNewIndividualShare() != null) {
+            sql.SET("new_individual_share = #{record.newIndividualShare,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNewAttrSettingType() != null) {
+            sql.SET("new_attr_setting_type = #{record.newAttrSettingType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getShareCommissionBase() != null) {
+            sql.SET("share_commission_base = #{record.shareCommissionBase,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIsSjht() != null) {
+            sql.SET("is_sjht = #{record.isSjht,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getSjhtProident() != null) {
+            sql.SET("sjht_proIdent = #{record.sjhtProident,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsOil() != null) {
+            sql.SET("is_oil = #{record.isOil,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getOilCoutypecode() != null) {
+            sql.SET("oil_couTypeCode = #{record.oilCoutypecode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIsAbholung() != null) {
+            sql.SET("is_abholung = #{record.isAbholung,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getIsTransnational() != null) {
+            sql.SET("is_transnational = #{record.isTransnational,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getGoodsTransferRate() != null) {
+            sql.SET("goods_transfer_rate = #{record.goodsTransferRate,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOilDiscount() != null) {
+            sql.SET("oil_discount = #{record.oilDiscount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOilType() != null) {
+            sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getDetail() != null) {
+            sql.SET("detail = #{record.detail,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getAttr() != null) {
+            sql.SET("attr = #{record.attr,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getCoverPic() != null) {
+            sql.SET("cover_pic = #{record.coverPic,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getFullCut() != null) {
+            sql.SET("full_cut = #{record.fullCut,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getIntegral() != null) {
+            sql.SET("integral = #{record.integral,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getShopId() != null) {
+            sql.SET("shop_id = #{record.shopId,jdbcType=LONGVARCHAR}");
+        }
+        
+        if (record.getVerifyCardId() != null) {
+            sql.SET("verify_card_id = #{record.verifyCardId,jdbcType=LONGVARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExampleWithBLOBs(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_goods");
+        
+        sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        sql.SET("store_id = #{record.storeId,jdbcType=INTEGER}");
+        sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
+        sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        sql.SET("original_price = #{record.originalPrice,jdbcType=DECIMAL}");
+        sql.SET("cat_id = #{record.catId,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=SMALLINT}");
+        sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        sql.SET("service = #{record.service,jdbcType=VARCHAR}");
+        sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
+        sql.SET("virtual_sales = #{record.virtualSales,jdbcType=INTEGER}");
+        sql.SET("video_url = #{record.videoUrl,jdbcType=VARCHAR}");
+        sql.SET("unit = #{record.unit,jdbcType=VARCHAR}");
+        sql.SET("individual_share = #{record.individualShare,jdbcType=SMALLINT}");
+        sql.SET("share_commission_first = #{record.shareCommissionFirst,jdbcType=DECIMAL}");
+        sql.SET("share_commission_second = #{record.shareCommissionSecond,jdbcType=DECIMAL}");
+        sql.SET("share_commission_third = #{record.shareCommissionThird,jdbcType=DECIMAL}");
+        sql.SET("weight = #{record.weight,jdbcType=DOUBLE}");
+        sql.SET("freight = #{record.freight,jdbcType=INTEGER}");
+        sql.SET("use_attr = #{record.useAttr,jdbcType=SMALLINT}");
+        sql.SET("share_type = #{record.shareType,jdbcType=INTEGER}");
+        sql.SET("quick_purchase = #{record.quickPurchase,jdbcType=SMALLINT}");
+        sql.SET("hot_cakes = #{record.hotCakes,jdbcType=SMALLINT}");
+        sql.SET("cost_price = #{record.costPrice,jdbcType=DECIMAL}");
+        sql.SET("member_discount = #{record.memberDiscount,jdbcType=SMALLINT}");
+        sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}");
+        sql.SET("mch_id = #{record.mchId,jdbcType=INTEGER}");
+        sql.SET("goods_num = #{record.goodsNum,jdbcType=INTEGER}");
+        sql.SET("mch_sort = #{record.mchSort,jdbcType=INTEGER}");
+        sql.SET("confine_count = #{record.confineCount,jdbcType=INTEGER}");
+        sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        sql.SET("`type` = #{record.type,jdbcType=SMALLINT}");
+        sql.SET("is_negotiable = #{record.isNegotiable,jdbcType=SMALLINT}");
+        sql.SET("attr_setting_type = #{record.attrSettingType,jdbcType=BIT}");
+        sql.SET("views = #{record.views,jdbcType=BIGINT}");
+        sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        sql.SET("supplier_goods_id = #{record.supplierGoodsId,jdbcType=INTEGER}");
+        sql.SET("supplier_id = #{record.supplierId,jdbcType=INTEGER}");
+        sql.SET("goods_share_title = #{record.goodsShareTitle,jdbcType=VARCHAR}");
+        sql.SET("goods_share_logo = #{record.goodsShareLogo,jdbcType=VARCHAR}");
+        sql.SET("goods_share_desc = #{record.goodsShareDesc,jdbcType=VARCHAR}");
+        sql.SET("is_examine = #{record.isExamine,jdbcType=INTEGER}");
+        sql.SET("dabao_price = #{record.dabaoPrice,jdbcType=DECIMAL}");
+        sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
+        sql.SET("key_word = #{record.keyWord,jdbcType=VARCHAR}");
+        sql.SET("buying_method = #{record.buyingMethod,jdbcType=INTEGER}");
+        sql.SET("buying_method_level = #{record.buyingMethodLevel,jdbcType=INTEGER}");
+        sql.SET("home_block_id = #{record.homeBlockId,jdbcType=INTEGER}");
+        sql.SET("new_individual_share = #{record.newIndividualShare,jdbcType=INTEGER}");
+        sql.SET("new_attr_setting_type = #{record.newAttrSettingType,jdbcType=INTEGER}");
+        sql.SET("share_commission_base = #{record.shareCommissionBase,jdbcType=DECIMAL}");
+        sql.SET("is_sjht = #{record.isSjht,jdbcType=SMALLINT}");
+        sql.SET("sjht_proIdent = #{record.sjhtProident,jdbcType=VARCHAR}");
+        sql.SET("is_oil = #{record.isOil,jdbcType=SMALLINT}");
+        sql.SET("oil_couTypeCode = #{record.oilCoutypecode,jdbcType=VARCHAR}");
+        sql.SET("is_abholung = #{record.isAbholung,jdbcType=SMALLINT}");
+        sql.SET("is_transnational = #{record.isTransnational,jdbcType=SMALLINT}");
+        sql.SET("goods_transfer_rate = #{record.goodsTransferRate,jdbcType=INTEGER}");
+        sql.SET("oil_discount = #{record.oilDiscount,jdbcType=INTEGER}");
+        sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
+        sql.SET("detail = #{record.detail,jdbcType=LONGVARCHAR}");
+        sql.SET("attr = #{record.attr,jdbcType=LONGVARCHAR}");
+        sql.SET("cover_pic = #{record.coverPic,jdbcType=LONGVARCHAR}");
+        sql.SET("full_cut = #{record.fullCut,jdbcType=LONGVARCHAR}");
+        sql.SET("integral = #{record.integral,jdbcType=LONGVARCHAR}");
+        sql.SET("shop_id = #{record.shopId,jdbcType=LONGVARCHAR}");
+        sql.SET("verify_card_id = #{record.verifyCardId,jdbcType=LONGVARCHAR}");
+        
+        CyymallGoodsExample example = (CyymallGoodsExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_goods");
+        
+        sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        sql.SET("store_id = #{record.storeId,jdbcType=INTEGER}");
+        sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
+        sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        sql.SET("original_price = #{record.originalPrice,jdbcType=DECIMAL}");
+        sql.SET("cat_id = #{record.catId,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=SMALLINT}");
+        sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        sql.SET("service = #{record.service,jdbcType=VARCHAR}");
+        sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
+        sql.SET("virtual_sales = #{record.virtualSales,jdbcType=INTEGER}");
+        sql.SET("video_url = #{record.videoUrl,jdbcType=VARCHAR}");
+        sql.SET("unit = #{record.unit,jdbcType=VARCHAR}");
+        sql.SET("individual_share = #{record.individualShare,jdbcType=SMALLINT}");
+        sql.SET("share_commission_first = #{record.shareCommissionFirst,jdbcType=DECIMAL}");
+        sql.SET("share_commission_second = #{record.shareCommissionSecond,jdbcType=DECIMAL}");
+        sql.SET("share_commission_third = #{record.shareCommissionThird,jdbcType=DECIMAL}");
+        sql.SET("weight = #{record.weight,jdbcType=DOUBLE}");
+        sql.SET("freight = #{record.freight,jdbcType=INTEGER}");
+        sql.SET("use_attr = #{record.useAttr,jdbcType=SMALLINT}");
+        sql.SET("share_type = #{record.shareType,jdbcType=INTEGER}");
+        sql.SET("quick_purchase = #{record.quickPurchase,jdbcType=SMALLINT}");
+        sql.SET("hot_cakes = #{record.hotCakes,jdbcType=SMALLINT}");
+        sql.SET("cost_price = #{record.costPrice,jdbcType=DECIMAL}");
+        sql.SET("member_discount = #{record.memberDiscount,jdbcType=SMALLINT}");
+        sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}");
+        sql.SET("mch_id = #{record.mchId,jdbcType=INTEGER}");
+        sql.SET("goods_num = #{record.goodsNum,jdbcType=INTEGER}");
+        sql.SET("mch_sort = #{record.mchSort,jdbcType=INTEGER}");
+        sql.SET("confine_count = #{record.confineCount,jdbcType=INTEGER}");
+        sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        sql.SET("`type` = #{record.type,jdbcType=SMALLINT}");
+        sql.SET("is_negotiable = #{record.isNegotiable,jdbcType=SMALLINT}");
+        sql.SET("attr_setting_type = #{record.attrSettingType,jdbcType=BIT}");
+        sql.SET("views = #{record.views,jdbcType=BIGINT}");
+        sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        sql.SET("supplier_goods_id = #{record.supplierGoodsId,jdbcType=INTEGER}");
+        sql.SET("supplier_id = #{record.supplierId,jdbcType=INTEGER}");
+        sql.SET("goods_share_title = #{record.goodsShareTitle,jdbcType=VARCHAR}");
+        sql.SET("goods_share_logo = #{record.goodsShareLogo,jdbcType=VARCHAR}");
+        sql.SET("goods_share_desc = #{record.goodsShareDesc,jdbcType=VARCHAR}");
+        sql.SET("is_examine = #{record.isExamine,jdbcType=INTEGER}");
+        sql.SET("dabao_price = #{record.dabaoPrice,jdbcType=DECIMAL}");
+        sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
+        sql.SET("key_word = #{record.keyWord,jdbcType=VARCHAR}");
+        sql.SET("buying_method = #{record.buyingMethod,jdbcType=INTEGER}");
+        sql.SET("buying_method_level = #{record.buyingMethodLevel,jdbcType=INTEGER}");
+        sql.SET("home_block_id = #{record.homeBlockId,jdbcType=INTEGER}");
+        sql.SET("new_individual_share = #{record.newIndividualShare,jdbcType=INTEGER}");
+        sql.SET("new_attr_setting_type = #{record.newAttrSettingType,jdbcType=INTEGER}");
+        sql.SET("share_commission_base = #{record.shareCommissionBase,jdbcType=DECIMAL}");
+        sql.SET("is_sjht = #{record.isSjht,jdbcType=SMALLINT}");
+        sql.SET("sjht_proIdent = #{record.sjhtProident,jdbcType=VARCHAR}");
+        sql.SET("is_oil = #{record.isOil,jdbcType=SMALLINT}");
+        sql.SET("oil_couTypeCode = #{record.oilCoutypecode,jdbcType=VARCHAR}");
+        sql.SET("is_abholung = #{record.isAbholung,jdbcType=SMALLINT}");
+        sql.SET("is_transnational = #{record.isTransnational,jdbcType=SMALLINT}");
+        sql.SET("goods_transfer_rate = #{record.goodsTransferRate,jdbcType=INTEGER}");
+        sql.SET("oil_discount = #{record.oilDiscount,jdbcType=INTEGER}");
+        sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
+        
+        CyymallGoodsExample example = (CyymallGoodsExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, CyymallGoodsExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/CyymallOrderDetailMapper.java

@@ -0,0 +1,108 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallOrderDetail;
+import com.hfkj.entity.CyymallOrderDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface CyymallOrderDetailMapper extends CyymallOrderDetailMapperExt {
+    @SelectProvider(type=CyymallOrderDetailSqlProvider.class, method="countByExample")
+    long countByExample(CyymallOrderDetailExample example);
+
+    @DeleteProvider(type=CyymallOrderDetailSqlProvider.class, method="deleteByExample")
+    int deleteByExample(CyymallOrderDetailExample example);
+
+    @Insert({
+        "insert into cyymall_order_detail (order_id, goods_id, ",
+        "num, total_price, ",
+        "addtime, is_delete, ",
+        "pic, integral, is_level, ",
+        "batch_price_tips, supplier_price, ",
+        "vgoods_id, vgoods_price, ",
+        "verify_card_sale_id, give_goods_id, ",
+        "attr)",
+        "values (#{orderId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, ",
+        "#{num,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ",
+        "#{addtime,jdbcType=INTEGER}, #{isDelete,jdbcType=SMALLINT}, ",
+        "#{pic,jdbcType=VARCHAR}, #{integral,jdbcType=INTEGER}, #{isLevel,jdbcType=SMALLINT}, ",
+        "#{batchPriceTips,jdbcType=VARCHAR}, #{supplierPrice,jdbcType=DECIMAL}, ",
+        "#{vgoodsId,jdbcType=INTEGER}, #{vgoodsPrice,jdbcType=DECIMAL}, ",
+        "#{verifyCardSaleId,jdbcType=INTEGER}, #{giveGoodsId,jdbcType=INTEGER}, ",
+        "#{attr,jdbcType=LONGVARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(CyymallOrderDetail record);
+
+    @InsertProvider(type=CyymallOrderDetailSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(CyymallOrderDetail record);
+
+    @SelectProvider(type=CyymallOrderDetailSqlProvider.class, method="selectByExampleWithBLOBs")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="num", property="num", jdbcType=JdbcType.INTEGER),
+        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
+        @Result(column="pic", property="pic", jdbcType=JdbcType.VARCHAR),
+        @Result(column="integral", property="integral", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_level", property="isLevel", jdbcType=JdbcType.SMALLINT),
+        @Result(column="batch_price_tips", property="batchPriceTips", jdbcType=JdbcType.VARCHAR),
+        @Result(column="supplier_price", property="supplierPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="vgoods_id", property="vgoodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="vgoods_price", property="vgoodsPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="verify_card_sale_id", property="verifyCardSaleId", jdbcType=JdbcType.INTEGER),
+        @Result(column="give_goods_id", property="giveGoodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="attr", property="attr", jdbcType=JdbcType.LONGVARCHAR)
+    })
+    List<CyymallOrderDetail> selectByExampleWithBLOBs(CyymallOrderDetailExample example);
+
+    @SelectProvider(type=CyymallOrderDetailSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.INTEGER),
+        @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="num", property="num", jdbcType=JdbcType.INTEGER),
+        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
+        @Result(column="pic", property="pic", jdbcType=JdbcType.VARCHAR),
+        @Result(column="integral", property="integral", jdbcType=JdbcType.INTEGER),
+        @Result(column="is_level", property="isLevel", jdbcType=JdbcType.SMALLINT),
+        @Result(column="batch_price_tips", property="batchPriceTips", jdbcType=JdbcType.VARCHAR),
+        @Result(column="supplier_price", property="supplierPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="vgoods_id", property="vgoodsId", jdbcType=JdbcType.INTEGER),
+        @Result(column="vgoods_price", property="vgoodsPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="verify_card_sale_id", property="verifyCardSaleId", jdbcType=JdbcType.INTEGER),
+        @Result(column="give_goods_id", property="giveGoodsId", jdbcType=JdbcType.INTEGER)
+    })
+    List<CyymallOrderDetail> selectByExample(CyymallOrderDetailExample example);
+
+    @UpdateProvider(type=CyymallOrderDetailSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") CyymallOrderDetail record, @Param("example") CyymallOrderDetailExample example);
+
+    @UpdateProvider(type=CyymallOrderDetailSqlProvider.class, method="updateByExampleWithBLOBs")
+    int updateByExampleWithBLOBs(@Param("record") CyymallOrderDetail record, @Param("example") CyymallOrderDetailExample example);
+
+    @UpdateProvider(type=CyymallOrderDetailSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") CyymallOrderDetail record, @Param("example") CyymallOrderDetailExample example);
+}

service/src/main/java/com/hfkj/dao/CyymallOrderDetailMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface CyymallOrderDetailMapperExt {
+}

service/src/main/java/com/hfkj/dao/CyymallOrderDetailSqlProvider.java

@@ -0,0 +1,387 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.CyymallOrderDetail;
+import com.hfkj.entity.CyymallOrderDetailExample.Criteria;
+import com.hfkj.entity.CyymallOrderDetailExample.Criterion;
+import com.hfkj.entity.CyymallOrderDetailExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CyymallOrderDetailSqlProvider {
+
+    public String countByExample(CyymallOrderDetailExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("cyymall_order_detail");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(CyymallOrderDetailExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("cyymall_order_detail");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(CyymallOrderDetail record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("cyymall_order_detail");
+        
+        if (record.getOrderId() != null) {
+            sql.VALUES("order_id", "#{orderId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsId() != null) {
+            sql.VALUES("goods_id", "#{goodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNum() != null) {
+            sql.VALUES("num", "#{num,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.VALUES("addtime", "#{addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.VALUES("is_delete", "#{isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getPic() != null) {
+            sql.VALUES("pic", "#{pic,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIntegral() != null) {
+            sql.VALUES("integral", "#{integral,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsLevel() != null) {
+            sql.VALUES("is_level", "#{isLevel,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getBatchPriceTips() != null) {
+            sql.VALUES("batch_price_tips", "#{batchPriceTips,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSupplierPrice() != null) {
+            sql.VALUES("supplier_price", "#{supplierPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getVgoodsId() != null) {
+            sql.VALUES("vgoods_id", "#{vgoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVgoodsPrice() != null) {
+            sql.VALUES("vgoods_price", "#{vgoodsPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getVerifyCardSaleId() != null) {
+            sql.VALUES("verify_card_sale_id", "#{verifyCardSaleId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGiveGoodsId() != null) {
+            sql.VALUES("give_goods_id", "#{giveGoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAttr() != null) {
+            sql.VALUES("attr", "#{attr,jdbcType=LONGVARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExampleWithBLOBs(CyymallOrderDetailExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("order_id");
+        sql.SELECT("goods_id");
+        sql.SELECT("num");
+        sql.SELECT("total_price");
+        sql.SELECT("addtime");
+        sql.SELECT("is_delete");
+        sql.SELECT("pic");
+        sql.SELECT("integral");
+        sql.SELECT("is_level");
+        sql.SELECT("batch_price_tips");
+        sql.SELECT("supplier_price");
+        sql.SELECT("vgoods_id");
+        sql.SELECT("vgoods_price");
+        sql.SELECT("verify_card_sale_id");
+        sql.SELECT("give_goods_id");
+        sql.SELECT("attr");
+        sql.FROM("cyymall_order_detail");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(CyymallOrderDetailExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("order_id");
+        sql.SELECT("goods_id");
+        sql.SELECT("num");
+        sql.SELECT("total_price");
+        sql.SELECT("addtime");
+        sql.SELECT("is_delete");
+        sql.SELECT("pic");
+        sql.SELECT("integral");
+        sql.SELECT("is_level");
+        sql.SELECT("batch_price_tips");
+        sql.SELECT("supplier_price");
+        sql.SELECT("vgoods_id");
+        sql.SELECT("vgoods_price");
+        sql.SELECT("verify_card_sale_id");
+        sql.SELECT("give_goods_id");
+        sql.FROM("cyymall_order_detail");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        CyymallOrderDetail record = (CyymallOrderDetail) parameter.get("record");
+        CyymallOrderDetailExample example = (CyymallOrderDetailExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_order_detail");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOrderId() != null) {
+            sql.SET("order_id = #{record.orderId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGoodsId() != null) {
+            sql.SET("goods_id = #{record.goodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getNum() != null) {
+            sql.SET("num = #{record.num,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getAddtime() != null) {
+            sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsDelete() != null) {
+            sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getPic() != null) {
+            sql.SET("pic = #{record.pic,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getIntegral() != null) {
+            sql.SET("integral = #{record.integral,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIsLevel() != null) {
+            sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        }
+        
+        if (record.getBatchPriceTips() != null) {
+            sql.SET("batch_price_tips = #{record.batchPriceTips,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSupplierPrice() != null) {
+            sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getVgoodsId() != null) {
+            sql.SET("vgoods_id = #{record.vgoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getVgoodsPrice() != null) {
+            sql.SET("vgoods_price = #{record.vgoodsPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getVerifyCardSaleId() != null) {
+            sql.SET("verify_card_sale_id = #{record.verifyCardSaleId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getGiveGoodsId() != null) {
+            sql.SET("give_goods_id = #{record.giveGoodsId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAttr() != null) {
+            sql.SET("attr = #{record.attr,jdbcType=LONGVARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExampleWithBLOBs(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_order_detail");
+        
+        sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        sql.SET("order_id = #{record.orderId,jdbcType=INTEGER}");
+        sql.SET("goods_id = #{record.goodsId,jdbcType=INTEGER}");
+        sql.SET("num = #{record.num,jdbcType=INTEGER}");
+        sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        sql.SET("pic = #{record.pic,jdbcType=VARCHAR}");
+        sql.SET("integral = #{record.integral,jdbcType=INTEGER}");
+        sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        sql.SET("batch_price_tips = #{record.batchPriceTips,jdbcType=VARCHAR}");
+        sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        sql.SET("vgoods_id = #{record.vgoodsId,jdbcType=INTEGER}");
+        sql.SET("vgoods_price = #{record.vgoodsPrice,jdbcType=DECIMAL}");
+        sql.SET("verify_card_sale_id = #{record.verifyCardSaleId,jdbcType=INTEGER}");
+        sql.SET("give_goods_id = #{record.giveGoodsId,jdbcType=INTEGER}");
+        sql.SET("attr = #{record.attr,jdbcType=LONGVARCHAR}");
+        
+        CyymallOrderDetailExample example = (CyymallOrderDetailExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("cyymall_order_detail");
+        
+        sql.SET("id = #{record.id,jdbcType=INTEGER}");
+        sql.SET("order_id = #{record.orderId,jdbcType=INTEGER}");
+        sql.SET("goods_id = #{record.goodsId,jdbcType=INTEGER}");
+        sql.SET("num = #{record.num,jdbcType=INTEGER}");
+        sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        sql.SET("addtime = #{record.addtime,jdbcType=INTEGER}");
+        sql.SET("is_delete = #{record.isDelete,jdbcType=SMALLINT}");
+        sql.SET("pic = #{record.pic,jdbcType=VARCHAR}");
+        sql.SET("integral = #{record.integral,jdbcType=INTEGER}");
+        sql.SET("is_level = #{record.isLevel,jdbcType=SMALLINT}");
+        sql.SET("batch_price_tips = #{record.batchPriceTips,jdbcType=VARCHAR}");
+        sql.SET("supplier_price = #{record.supplierPrice,jdbcType=DECIMAL}");
+        sql.SET("vgoods_id = #{record.vgoodsId,jdbcType=INTEGER}");
+        sql.SET("vgoods_price = #{record.vgoodsPrice,jdbcType=DECIMAL}");
+        sql.SET("verify_card_sale_id = #{record.verifyCardSaleId,jdbcType=INTEGER}");
+        sql.SET("give_goods_id = #{record.giveGoodsId,jdbcType=INTEGER}");
+        
+        CyymallOrderDetailExample example = (CyymallOrderDetailExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, CyymallOrderDetailExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/CyymallOrderMapper.java

@@ -4,7 +4,6 @@ import com.hfkj.entity.CyymallOrder;
 import com.hfkj.entity.CyymallOrderExample;
 import com.hfkj.entity.CyymallOrderWithBLOBs;
 import java.util.List;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.InsertProvider;
@@ -12,9 +11,7 @@ import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.stereotype.Repository;
@@ -33,12 +30,6 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
     @DeleteProvider(type=CyymallOrderSqlProvider.class, method="deleteByExample")
     int deleteByExample(CyymallOrderExample example);
 
-    @Delete({
-        "delete from cyymall_order",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    int deleteByPrimaryKey(Integer id);
-
     @Insert({
         "insert into cyymall_order (store_id, user_id, ",
         "order_no, total_price, ",
@@ -58,9 +49,9 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
         "is_cancel, before_update_price, ",
         "shop_id, discount, ",
         "user_coupon_id, give_integral, ",
-        "parent_id_1, parent_id_2, ",
+        "parent_id_2, parent_id_3, ",
         "is_sale, version, ",
-        "express_price_1, is_recycle, ",
+        "express_price_2, is_recycle, ",
         "rebate, before_update_express, ",
         "mch_id, order_union_id, ",
         "is_transfer, `type`, ",
@@ -102,9 +93,9 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
         "#{isCancel,jdbcType=SMALLINT}, #{beforeUpdatePrice,jdbcType=DECIMAL}, ",
         "#{shopId,jdbcType=INTEGER}, #{discount,jdbcType=DECIMAL}, ",
         "#{userCouponId,jdbcType=INTEGER}, #{giveIntegral,jdbcType=SMALLINT}, ",
-        "#{parentId1,jdbcType=INTEGER}, #{parentId2,jdbcType=INTEGER}, ",
+        "#{parentId2,jdbcType=INTEGER}, #{parentId3,jdbcType=INTEGER}, ",
         "#{isSale,jdbcType=INTEGER}, #{version,jdbcType=VARCHAR}, ",
-        "#{expressPrice1,jdbcType=DECIMAL}, #{isRecycle,jdbcType=SMALLINT}, ",
+        "#{expressPrice2,jdbcType=DECIMAL}, #{isRecycle,jdbcType=SMALLINT}, ",
         "#{rebate,jdbcType=DECIMAL}, #{beforeUpdateExpress,jdbcType=DECIMAL}, ",
         "#{mchId,jdbcType=INTEGER}, #{orderUnionId,jdbcType=INTEGER}, ",
         "#{isTransfer,jdbcType=SMALLINT}, #{type,jdbcType=INTEGER}, ",
@@ -138,7 +129,7 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
 
     @SelectProvider(type=CyymallOrderSqlProvider.class, method="selectByExampleWithBLOBs")
     @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER),
         @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@@ -176,11 +167,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
         @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL),
         @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER),
         @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT),
-        @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER),
         @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER),
+        @Result(column="parent_id_3", property="parentId3", jdbcType=JdbcType.INTEGER),
         @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER),
         @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR),
-        @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL),
+        @Result(column="express_price_2", property="expressPrice2", jdbcType=JdbcType.DECIMAL),
         @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT),
         @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL),
         @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL),
@@ -235,7 +226,7 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
 
     @SelectProvider(type=CyymallOrderSqlProvider.class, method="selectByExample")
     @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER),
         @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@@ -273,11 +264,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
         @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL),
         @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER),
         @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT),
-        @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER),
         @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER),
+        @Result(column="parent_id_3", property="parentId3", jdbcType=JdbcType.INTEGER),
         @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER),
         @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR),
-        @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL),
+        @Result(column="express_price_2", property="expressPrice2", jdbcType=JdbcType.DECIMAL),
         @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT),
         @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL),
         @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL),
@@ -324,121 +315,6 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
     })
     List<CyymallOrder> selectByExample(CyymallOrderExample example);
 
-    @Select({
-        "select",
-        "id, store_id, user_id, order_no, total_price, pay_price, express_price, `name`, ",
-        "mobile, address, remark, is_pay, pay_type, pay_time, is_send, send_time, express, ",
-        "express_no, is_confirm, confirm_time, is_comment, apply_delete, addtime, is_delete, ",
-        "is_price, parent_id, first_price, second_price, third_price, coupon_sub_price, ",
-        "is_offline, clerk_id, is_cancel, before_update_price, shop_id, discount, user_coupon_id, ",
-        "give_integral, parent_id_1, parent_id_2, is_sale, version, express_price_1, ",
-        "is_recycle, rebate, before_update_express, mch_id, order_union_id, is_transfer, ",
-        "`type`, share_price, is_show, currency, order_origin, delivery_id, delivery_status, ",
-        "fy_status, fyjine, fysingle, mch_fyjine, mch_fysingle, is_fan, is_dada, shop_peisong, ",
-        "is_open_offline, supplier_id, is_sup_transfer, dabao_price, settlement_amount, ",
-        "is_settlement, settlement_time, is_mch_shop, is_divide_money, transaction_id, ",
-        "pay_user_id, pay_type_true, is_vgoods, reduction_price, minus_price, order_from, ",
-        "discount_price, discount_num, give_goods_id, coupon_record_id, id_card_no, refund_time, ",
-        "content, address_data, offline_qrcode, integral, words, seller_comments",
-        "from cyymall_order",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
-        @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
-        @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER),
-        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="express_price", property="expressPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
-        @Result(column="mobile", property="mobile", jdbcType=JdbcType.VARCHAR),
-        @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR),
-        @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR),
-        @Result(column="is_pay", property="isPay", jdbcType=JdbcType.SMALLINT),
-        @Result(column="pay_type", property="payType", jdbcType=JdbcType.SMALLINT),
-        @Result(column="pay_time", property="payTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_send", property="isSend", jdbcType=JdbcType.SMALLINT),
-        @Result(column="send_time", property="sendTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="express", property="express", jdbcType=JdbcType.VARCHAR),
-        @Result(column="express_no", property="expressNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="is_confirm", property="isConfirm", jdbcType=JdbcType.SMALLINT),
-        @Result(column="confirm_time", property="confirmTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_comment", property="isComment", jdbcType=JdbcType.SMALLINT),
-        @Result(column="apply_delete", property="applyDelete", jdbcType=JdbcType.SMALLINT),
-        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
-        @Result(column="is_price", property="isPrice", jdbcType=JdbcType.SMALLINT),
-        @Result(column="parent_id", property="parentId", jdbcType=JdbcType.INTEGER),
-        @Result(column="first_price", property="firstPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="second_price", property="secondPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="third_price", property="thirdPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="coupon_sub_price", property="couponSubPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_offline", property="isOffline", jdbcType=JdbcType.INTEGER),
-        @Result(column="clerk_id", property="clerkId", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_cancel", property="isCancel", jdbcType=JdbcType.SMALLINT),
-        @Result(column="before_update_price", property="beforeUpdatePrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="shop_id", property="shopId", jdbcType=JdbcType.INTEGER),
-        @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL),
-        @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER),
-        @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT),
-        @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER),
-        @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER),
-        @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR),
-        @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT),
-        @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL),
-        @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL),
-        @Result(column="mch_id", property="mchId", jdbcType=JdbcType.INTEGER),
-        @Result(column="order_union_id", property="orderUnionId", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_transfer", property="isTransfer", jdbcType=JdbcType.SMALLINT),
-        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
-        @Result(column="share_price", property="sharePrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_show", property="isShow", jdbcType=JdbcType.SMALLINT),
-        @Result(column="currency", property="currency", jdbcType=JdbcType.DECIMAL),
-        @Result(column="order_origin", property="orderOrigin", jdbcType=JdbcType.BIT),
-        @Result(column="delivery_id", property="deliveryId", jdbcType=JdbcType.INTEGER),
-        @Result(column="delivery_status", property="deliveryStatus", jdbcType=JdbcType.BIT),
-        @Result(column="fy_status", property="fyStatus", jdbcType=JdbcType.BIT),
-        @Result(column="fyjine", property="fyjine", jdbcType=JdbcType.DECIMAL),
-        @Result(column="fysingle", property="fysingle", jdbcType=JdbcType.DECIMAL),
-        @Result(column="mch_fyjine", property="mchFyjine", jdbcType=JdbcType.DECIMAL),
-        @Result(column="mch_fysingle", property="mchFysingle", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_fan", property="isFan", jdbcType=JdbcType.BIT),
-        @Result(column="is_dada", property="isDada", jdbcType=JdbcType.BIT),
-        @Result(column="shop_peisong", property="shopPeisong", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_open_offline", property="isOpenOffline", jdbcType=JdbcType.BIT),
-        @Result(column="supplier_id", property="supplierId", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_sup_transfer", property="isSupTransfer", jdbcType=JdbcType.BIT),
-        @Result(column="dabao_price", property="dabaoPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="settlement_amount", property="settlementAmount", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_settlement", property="isSettlement", jdbcType=JdbcType.SMALLINT),
-        @Result(column="settlement_time", property="settlementTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_mch_shop", property="isMchShop", jdbcType=JdbcType.BIT),
-        @Result(column="is_divide_money", property="isDivideMoney", jdbcType=JdbcType.BIT),
-        @Result(column="transaction_id", property="transactionId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="pay_user_id", property="payUserId", jdbcType=JdbcType.INTEGER),
-        @Result(column="pay_type_true", property="payTypeTrue", jdbcType=JdbcType.BIT),
-        @Result(column="is_vgoods", property="isVgoods", jdbcType=JdbcType.INTEGER),
-        @Result(column="reduction_price", property="reductionPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="minus_price", property="minusPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="order_from", property="orderFrom", jdbcType=JdbcType.INTEGER),
-        @Result(column="discount_price", property="discountPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="discount_num", property="discountNum", jdbcType=JdbcType.DECIMAL),
-        @Result(column="give_goods_id", property="giveGoodsId", jdbcType=JdbcType.INTEGER),
-        @Result(column="coupon_record_id", property="couponRecordId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="id_card_no", property="idCardNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="content", property="content", jdbcType=JdbcType.LONGVARCHAR),
-        @Result(column="address_data", property="addressData", jdbcType=JdbcType.LONGVARCHAR),
-        @Result(column="offline_qrcode", property="offlineQrcode", jdbcType=JdbcType.LONGVARCHAR),
-        @Result(column="integral", property="integral", jdbcType=JdbcType.LONGVARCHAR),
-        @Result(column="words", property="words", jdbcType=JdbcType.LONGVARCHAR),
-        @Result(column="seller_comments", property="sellerComments", jdbcType=JdbcType.LONGVARCHAR)
-    })
-    CyymallOrderWithBLOBs selectByPrimaryKey(Integer id);
-
     @UpdateProvider(type=CyymallOrderSqlProvider.class, method="updateByExampleSelective")
     int updateByExampleSelective(@Param("record") CyymallOrderWithBLOBs record, @Param("example") CyymallOrderExample example);
 
@@ -447,195 +323,4 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt {
 
     @UpdateProvider(type=CyymallOrderSqlProvider.class, method="updateByExample")
     int updateByExample(@Param("record") CyymallOrder record, @Param("example") CyymallOrderExample example);
-
-    @UpdateProvider(type=CyymallOrderSqlProvider.class, method="updateByPrimaryKeySelective")
-    int updateByPrimaryKeySelective(CyymallOrderWithBLOBs record);
-
-    @Update({
-        "update cyymall_order",
-        "set store_id = #{storeId,jdbcType=INTEGER},",
-          "user_id = #{userId,jdbcType=INTEGER},",
-          "order_no = #{orderNo,jdbcType=VARCHAR},",
-          "total_price = #{totalPrice,jdbcType=DECIMAL},",
-          "pay_price = #{payPrice,jdbcType=DECIMAL},",
-          "express_price = #{expressPrice,jdbcType=DECIMAL},",
-          "`name` = #{name,jdbcType=VARCHAR},",
-          "mobile = #{mobile,jdbcType=VARCHAR},",
-          "address = #{address,jdbcType=VARCHAR},",
-          "remark = #{remark,jdbcType=VARCHAR},",
-          "is_pay = #{isPay,jdbcType=SMALLINT},",
-          "pay_type = #{payType,jdbcType=SMALLINT},",
-          "pay_time = #{payTime,jdbcType=INTEGER},",
-          "is_send = #{isSend,jdbcType=SMALLINT},",
-          "send_time = #{sendTime,jdbcType=INTEGER},",
-          "express = #{express,jdbcType=VARCHAR},",
-          "express_no = #{expressNo,jdbcType=VARCHAR},",
-          "is_confirm = #{isConfirm,jdbcType=SMALLINT},",
-          "confirm_time = #{confirmTime,jdbcType=INTEGER},",
-          "is_comment = #{isComment,jdbcType=SMALLINT},",
-          "apply_delete = #{applyDelete,jdbcType=SMALLINT},",
-          "addtime = #{addtime,jdbcType=INTEGER},",
-          "is_delete = #{isDelete,jdbcType=SMALLINT},",
-          "is_price = #{isPrice,jdbcType=SMALLINT},",
-          "parent_id = #{parentId,jdbcType=INTEGER},",
-          "first_price = #{firstPrice,jdbcType=DECIMAL},",
-          "second_price = #{secondPrice,jdbcType=DECIMAL},",
-          "third_price = #{thirdPrice,jdbcType=DECIMAL},",
-          "coupon_sub_price = #{couponSubPrice,jdbcType=DECIMAL},",
-          "is_offline = #{isOffline,jdbcType=INTEGER},",
-          "clerk_id = #{clerkId,jdbcType=INTEGER},",
-          "is_cancel = #{isCancel,jdbcType=SMALLINT},",
-          "before_update_price = #{beforeUpdatePrice,jdbcType=DECIMAL},",
-          "shop_id = #{shopId,jdbcType=INTEGER},",
-          "discount = #{discount,jdbcType=DECIMAL},",
-          "user_coupon_id = #{userCouponId,jdbcType=INTEGER},",
-          "give_integral = #{giveIntegral,jdbcType=SMALLINT},",
-          "parent_id_1 = #{parentId1,jdbcType=INTEGER},",
-          "parent_id_2 = #{parentId2,jdbcType=INTEGER},",
-          "is_sale = #{isSale,jdbcType=INTEGER},",
-          "version = #{version,jdbcType=VARCHAR},",
-          "express_price_1 = #{expressPrice1,jdbcType=DECIMAL},",
-          "is_recycle = #{isRecycle,jdbcType=SMALLINT},",
-          "rebate = #{rebate,jdbcType=DECIMAL},",
-          "before_update_express = #{beforeUpdateExpress,jdbcType=DECIMAL},",
-          "mch_id = #{mchId,jdbcType=INTEGER},",
-          "order_union_id = #{orderUnionId,jdbcType=INTEGER},",
-          "is_transfer = #{isTransfer,jdbcType=SMALLINT},",
-          "`type` = #{type,jdbcType=INTEGER},",
-          "share_price = #{sharePrice,jdbcType=DECIMAL},",
-          "is_show = #{isShow,jdbcType=SMALLINT},",
-          "currency = #{currency,jdbcType=DECIMAL},",
-          "order_origin = #{orderOrigin,jdbcType=BIT},",
-          "delivery_id = #{deliveryId,jdbcType=INTEGER},",
-          "delivery_status = #{deliveryStatus,jdbcType=BIT},",
-          "fy_status = #{fyStatus,jdbcType=BIT},",
-          "fyjine = #{fyjine,jdbcType=DECIMAL},",
-          "fysingle = #{fysingle,jdbcType=DECIMAL},",
-          "mch_fyjine = #{mchFyjine,jdbcType=DECIMAL},",
-          "mch_fysingle = #{mchFysingle,jdbcType=DECIMAL},",
-          "is_fan = #{isFan,jdbcType=BIT},",
-          "is_dada = #{isDada,jdbcType=BIT},",
-          "shop_peisong = #{shopPeisong,jdbcType=INTEGER},",
-          "is_open_offline = #{isOpenOffline,jdbcType=BIT},",
-          "supplier_id = #{supplierId,jdbcType=INTEGER},",
-          "is_sup_transfer = #{isSupTransfer,jdbcType=BIT},",
-          "dabao_price = #{dabaoPrice,jdbcType=DECIMAL},",
-          "settlement_amount = #{settlementAmount,jdbcType=DECIMAL},",
-          "is_settlement = #{isSettlement,jdbcType=SMALLINT},",
-          "settlement_time = #{settlementTime,jdbcType=INTEGER},",
-          "is_mch_shop = #{isMchShop,jdbcType=BIT},",
-          "is_divide_money = #{isDivideMoney,jdbcType=BIT},",
-          "transaction_id = #{transactionId,jdbcType=VARCHAR},",
-          "pay_user_id = #{payUserId,jdbcType=INTEGER},",
-          "pay_type_true = #{payTypeTrue,jdbcType=BIT},",
-          "is_vgoods = #{isVgoods,jdbcType=INTEGER},",
-          "reduction_price = #{reductionPrice,jdbcType=DECIMAL},",
-          "minus_price = #{minusPrice,jdbcType=DECIMAL},",
-          "order_from = #{orderFrom,jdbcType=INTEGER},",
-          "discount_price = #{discountPrice,jdbcType=DECIMAL},",
-          "discount_num = #{discountNum,jdbcType=DECIMAL},",
-          "give_goods_id = #{giveGoodsId,jdbcType=INTEGER},",
-          "coupon_record_id = #{couponRecordId,jdbcType=VARCHAR},",
-          "id_card_no = #{idCardNo,jdbcType=VARCHAR},",
-          "refund_time = #{refundTime,jdbcType=INTEGER},",
-          "content = #{content,jdbcType=LONGVARCHAR},",
-          "address_data = #{addressData,jdbcType=LONGVARCHAR},",
-          "offline_qrcode = #{offlineQrcode,jdbcType=LONGVARCHAR},",
-          "integral = #{integral,jdbcType=LONGVARCHAR},",
-          "words = #{words,jdbcType=LONGVARCHAR},",
-          "seller_comments = #{sellerComments,jdbcType=LONGVARCHAR}",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    int updateByPrimaryKeyWithBLOBs(CyymallOrderWithBLOBs record);
-
-    @Update({
-        "update cyymall_order",
-        "set store_id = #{storeId,jdbcType=INTEGER},",
-          "user_id = #{userId,jdbcType=INTEGER},",
-          "order_no = #{orderNo,jdbcType=VARCHAR},",
-          "total_price = #{totalPrice,jdbcType=DECIMAL},",
-          "pay_price = #{payPrice,jdbcType=DECIMAL},",
-          "express_price = #{expressPrice,jdbcType=DECIMAL},",
-          "`name` = #{name,jdbcType=VARCHAR},",
-          "mobile = #{mobile,jdbcType=VARCHAR},",
-          "address = #{address,jdbcType=VARCHAR},",
-          "remark = #{remark,jdbcType=VARCHAR},",
-          "is_pay = #{isPay,jdbcType=SMALLINT},",
-          "pay_type = #{payType,jdbcType=SMALLINT},",
-          "pay_time = #{payTime,jdbcType=INTEGER},",
-          "is_send = #{isSend,jdbcType=SMALLINT},",
-          "send_time = #{sendTime,jdbcType=INTEGER},",
-          "express = #{express,jdbcType=VARCHAR},",
-          "express_no = #{expressNo,jdbcType=VARCHAR},",
-          "is_confirm = #{isConfirm,jdbcType=SMALLINT},",
-          "confirm_time = #{confirmTime,jdbcType=INTEGER},",
-          "is_comment = #{isComment,jdbcType=SMALLINT},",
-          "apply_delete = #{applyDelete,jdbcType=SMALLINT},",
-          "addtime = #{addtime,jdbcType=INTEGER},",
-          "is_delete = #{isDelete,jdbcType=SMALLINT},",
-          "is_price = #{isPrice,jdbcType=SMALLINT},",
-          "parent_id = #{parentId,jdbcType=INTEGER},",
-          "first_price = #{firstPrice,jdbcType=DECIMAL},",
-          "second_price = #{secondPrice,jdbcType=DECIMAL},",
-          "third_price = #{thirdPrice,jdbcType=DECIMAL},",
-          "coupon_sub_price = #{couponSubPrice,jdbcType=DECIMAL},",
-          "is_offline = #{isOffline,jdbcType=INTEGER},",
-          "clerk_id = #{clerkId,jdbcType=INTEGER},",
-          "is_cancel = #{isCancel,jdbcType=SMALLINT},",
-          "before_update_price = #{beforeUpdatePrice,jdbcType=DECIMAL},",
-          "shop_id = #{shopId,jdbcType=INTEGER},",
-          "discount = #{discount,jdbcType=DECIMAL},",
-          "user_coupon_id = #{userCouponId,jdbcType=INTEGER},",
-          "give_integral = #{giveIntegral,jdbcType=SMALLINT},",
-          "parent_id_1 = #{parentId1,jdbcType=INTEGER},",
-          "parent_id_2 = #{parentId2,jdbcType=INTEGER},",
-          "is_sale = #{isSale,jdbcType=INTEGER},",
-          "version = #{version,jdbcType=VARCHAR},",
-          "express_price_1 = #{expressPrice1,jdbcType=DECIMAL},",
-          "is_recycle = #{isRecycle,jdbcType=SMALLINT},",
-          "rebate = #{rebate,jdbcType=DECIMAL},",
-          "before_update_express = #{beforeUpdateExpress,jdbcType=DECIMAL},",
-          "mch_id = #{mchId,jdbcType=INTEGER},",
-          "order_union_id = #{orderUnionId,jdbcType=INTEGER},",
-          "is_transfer = #{isTransfer,jdbcType=SMALLINT},",
-          "`type` = #{type,jdbcType=INTEGER},",
-          "share_price = #{sharePrice,jdbcType=DECIMAL},",
-          "is_show = #{isShow,jdbcType=SMALLINT},",
-          "currency = #{currency,jdbcType=DECIMAL},",
-          "order_origin = #{orderOrigin,jdbcType=BIT},",
-          "delivery_id = #{deliveryId,jdbcType=INTEGER},",
-          "delivery_status = #{deliveryStatus,jdbcType=BIT},",
-          "fy_status = #{fyStatus,jdbcType=BIT},",
-          "fyjine = #{fyjine,jdbcType=DECIMAL},",
-          "fysingle = #{fysingle,jdbcType=DECIMAL},",
-          "mch_fyjine = #{mchFyjine,jdbcType=DECIMAL},",
-          "mch_fysingle = #{mchFysingle,jdbcType=DECIMAL},",
-          "is_fan = #{isFan,jdbcType=BIT},",
-          "is_dada = #{isDada,jdbcType=BIT},",
-          "shop_peisong = #{shopPeisong,jdbcType=INTEGER},",
-          "is_open_offline = #{isOpenOffline,jdbcType=BIT},",
-          "supplier_id = #{supplierId,jdbcType=INTEGER},",
-          "is_sup_transfer = #{isSupTransfer,jdbcType=BIT},",
-          "dabao_price = #{dabaoPrice,jdbcType=DECIMAL},",
-          "settlement_amount = #{settlementAmount,jdbcType=DECIMAL},",
-          "is_settlement = #{isSettlement,jdbcType=SMALLINT},",
-          "settlement_time = #{settlementTime,jdbcType=INTEGER},",
-          "is_mch_shop = #{isMchShop,jdbcType=BIT},",
-          "is_divide_money = #{isDivideMoney,jdbcType=BIT},",
-          "transaction_id = #{transactionId,jdbcType=VARCHAR},",
-          "pay_user_id = #{payUserId,jdbcType=INTEGER},",
-          "pay_type_true = #{payTypeTrue,jdbcType=BIT},",
-          "is_vgoods = #{isVgoods,jdbcType=INTEGER},",
-          "reduction_price = #{reductionPrice,jdbcType=DECIMAL},",
-          "minus_price = #{minusPrice,jdbcType=DECIMAL},",
-          "order_from = #{orderFrom,jdbcType=INTEGER},",
-          "discount_price = #{discountPrice,jdbcType=DECIMAL},",
-          "discount_num = #{discountNum,jdbcType=DECIMAL},",
-          "give_goods_id = #{giveGoodsId,jdbcType=INTEGER},",
-          "coupon_record_id = #{couponRecordId,jdbcType=VARCHAR},",
-          "id_card_no = #{idCardNo,jdbcType=VARCHAR},",
-          "refund_time = #{refundTime,jdbcType=INTEGER}",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    int updateByPrimaryKey(CyymallOrder record);
 }

service/src/main/java/com/hfkj/dao/CyymallOrderSqlProvider.java

@@ -176,14 +176,14 @@ public class CyymallOrderSqlProvider {
             sql.VALUES("give_integral", "#{giveIntegral,jdbcType=SMALLINT}");
         }
         
-        if (record.getParentId1() != null) {
-            sql.VALUES("parent_id_1", "#{parentId1,jdbcType=INTEGER}");
-        }
-        
         if (record.getParentId2() != null) {
             sql.VALUES("parent_id_2", "#{parentId2,jdbcType=INTEGER}");
         }
         
+        if (record.getParentId3() != null) {
+            sql.VALUES("parent_id_3", "#{parentId3,jdbcType=INTEGER}");
+        }
+        
         if (record.getIsSale() != null) {
             sql.VALUES("is_sale", "#{isSale,jdbcType=INTEGER}");
         }
@@ -192,8 +192,8 @@ public class CyymallOrderSqlProvider {
             sql.VALUES("version", "#{version,jdbcType=VARCHAR}");
         }
         
-        if (record.getExpressPrice1() != null) {
-            sql.VALUES("express_price_1", "#{expressPrice1,jdbcType=DECIMAL}");
+        if (record.getExpressPrice2() != null) {
+            sql.VALUES("express_price_2", "#{expressPrice2,jdbcType=DECIMAL}");
         }
         
         if (record.getIsRecycle() != null) {
@@ -439,11 +439,11 @@ public class CyymallOrderSqlProvider {
         sql.SELECT("discount");
         sql.SELECT("user_coupon_id");
         sql.SELECT("give_integral");
-        sql.SELECT("parent_id_1");
         sql.SELECT("parent_id_2");
+        sql.SELECT("parent_id_3");
         sql.SELECT("is_sale");
         sql.SELECT("version");
-        sql.SELECT("express_price_1");
+        sql.SELECT("express_price_2");
         sql.SELECT("is_recycle");
         sql.SELECT("rebate");
         sql.SELECT("before_update_express");
@@ -547,11 +547,11 @@ public class CyymallOrderSqlProvider {
         sql.SELECT("discount");
         sql.SELECT("user_coupon_id");
         sql.SELECT("give_integral");
-        sql.SELECT("parent_id_1");
         sql.SELECT("parent_id_2");
+        sql.SELECT("parent_id_3");
         sql.SELECT("is_sale");
         sql.SELECT("version");
-        sql.SELECT("express_price_1");
+        sql.SELECT("express_price_2");
         sql.SELECT("is_recycle");
         sql.SELECT("rebate");
         sql.SELECT("before_update_express");
@@ -764,14 +764,14 @@ public class CyymallOrderSqlProvider {
             sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}");
         }
         
-        if (record.getParentId1() != null) {
-            sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}");
-        }
-        
         if (record.getParentId2() != null) {
             sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}");
         }
         
+        if (record.getParentId3() != null) {
+            sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}");
+        }
+        
         if (record.getIsSale() != null) {
             sql.SET("is_sale = #{record.isSale,jdbcType=INTEGER}");
         }
@@ -780,8 +780,8 @@ public class CyymallOrderSqlProvider {
             sql.SET("version = #{record.version,jdbcType=VARCHAR}");
         }
         
-        if (record.getExpressPrice1() != null) {
-            sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}");
+        if (record.getExpressPrice2() != null) {
+            sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}");
         }
         
         if (record.getIsRecycle() != null) {
@@ -1026,11 +1026,11 @@ public class CyymallOrderSqlProvider {
         sql.SET("discount = #{record.discount,jdbcType=DECIMAL}");
         sql.SET("user_coupon_id = #{record.userCouponId,jdbcType=INTEGER}");
         sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}");
-        sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}");
         sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}");
+        sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}");
         sql.SET("is_sale = #{record.isSale,jdbcType=INTEGER}");
         sql.SET("version = #{record.version,jdbcType=VARCHAR}");
-        sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}");
+        sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}");
         sql.SET("is_recycle = #{record.isRecycle,jdbcType=SMALLINT}");
         sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}");
         sql.SET("before_update_express = #{record.beforeUpdateExpress,jdbcType=DECIMAL}");
@@ -1128,11 +1128,11 @@ public class CyymallOrderSqlProvider {
         sql.SET("discount = #{record.discount,jdbcType=DECIMAL}");
         sql.SET("user_coupon_id = #{record.userCouponId,jdbcType=INTEGER}");
         sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}");
-        sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}");
         sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}");
+        sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}");
         sql.SET("is_sale = #{record.isSale,jdbcType=INTEGER}");
         sql.SET("version = #{record.version,jdbcType=VARCHAR}");
-        sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}");
+        sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}");
         sql.SET("is_recycle = #{record.isRecycle,jdbcType=SMALLINT}");
         sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}");
         sql.SET("before_update_express = #{record.beforeUpdateExpress,jdbcType=DECIMAL}");
@@ -1182,379 +1182,6 @@ public class CyymallOrderSqlProvider {
         return sql.toString();
     }
 
-    public String updateByPrimaryKeySelective(CyymallOrderWithBLOBs record) {
-        SQL sql = new SQL();
-        sql.UPDATE("cyymall_order");
-        
-        if (record.getStoreId() != null) {
-            sql.SET("store_id = #{storeId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getUserId() != null) {
-            sql.SET("user_id = #{userId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getOrderNo() != null) {
-            sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getTotalPrice() != null) {
-            sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getPayPrice() != null) {
-            sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getExpressPrice() != null) {
-            sql.SET("express_price = #{expressPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getName() != null) {
-            sql.SET("`name` = #{name,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getMobile() != null) {
-            sql.SET("mobile = #{mobile,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getAddress() != null) {
-            sql.SET("address = #{address,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getRemark() != null) {
-            sql.SET("remark = #{remark,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIsPay() != null) {
-            sql.SET("is_pay = #{isPay,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getPayType() != null) {
-            sql.SET("pay_type = #{payType,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getPayTime() != null) {
-            sql.SET("pay_time = #{payTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsSend() != null) {
-            sql.SET("is_send = #{isSend,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getSendTime() != null) {
-            sql.SET("send_time = #{sendTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getExpress() != null) {
-            sql.SET("express = #{express,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getExpressNo() != null) {
-            sql.SET("express_no = #{expressNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIsConfirm() != null) {
-            sql.SET("is_confirm = #{isConfirm,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getConfirmTime() != null) {
-            sql.SET("confirm_time = #{confirmTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsComment() != null) {
-            sql.SET("is_comment = #{isComment,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getApplyDelete() != null) {
-            sql.SET("apply_delete = #{applyDelete,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getAddtime() != null) {
-            sql.SET("addtime = #{addtime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsDelete() != null) {
-            sql.SET("is_delete = #{isDelete,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getIsPrice() != null) {
-            sql.SET("is_price = #{isPrice,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getParentId() != null) {
-            sql.SET("parent_id = #{parentId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getFirstPrice() != null) {
-            sql.SET("first_price = #{firstPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getSecondPrice() != null) {
-            sql.SET("second_price = #{secondPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getThirdPrice() != null) {
-            sql.SET("third_price = #{thirdPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getCouponSubPrice() != null) {
-            sql.SET("coupon_sub_price = #{couponSubPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsOffline() != null) {
-            sql.SET("is_offline = #{isOffline,jdbcType=INTEGER}");
-        }
-        
-        if (record.getClerkId() != null) {
-            sql.SET("clerk_id = #{clerkId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsCancel() != null) {
-            sql.SET("is_cancel = #{isCancel,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getBeforeUpdatePrice() != null) {
-            sql.SET("before_update_price = #{beforeUpdatePrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getShopId() != null) {
-            sql.SET("shop_id = #{shopId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getDiscount() != null) {
-            sql.SET("discount = #{discount,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getUserCouponId() != null) {
-            sql.SET("user_coupon_id = #{userCouponId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getGiveIntegral() != null) {
-            sql.SET("give_integral = #{giveIntegral,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getParentId1() != null) {
-            sql.SET("parent_id_1 = #{parentId1,jdbcType=INTEGER}");
-        }
-        
-        if (record.getParentId2() != null) {
-            sql.SET("parent_id_2 = #{parentId2,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsSale() != null) {
-            sql.SET("is_sale = #{isSale,jdbcType=INTEGER}");
-        }
-        
-        if (record.getVersion() != null) {
-            sql.SET("version = #{version,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getExpressPrice1() != null) {
-            sql.SET("express_price_1 = #{expressPrice1,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsRecycle() != null) {
-            sql.SET("is_recycle = #{isRecycle,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getRebate() != null) {
-            sql.SET("rebate = #{rebate,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getBeforeUpdateExpress() != null) {
-            sql.SET("before_update_express = #{beforeUpdateExpress,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getMchId() != null) {
-            sql.SET("mch_id = #{mchId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getOrderUnionId() != null) {
-            sql.SET("order_union_id = #{orderUnionId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsTransfer() != null) {
-            sql.SET("is_transfer = #{isTransfer,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getType() != null) {
-            sql.SET("`type` = #{type,jdbcType=INTEGER}");
-        }
-        
-        if (record.getSharePrice() != null) {
-            sql.SET("share_price = #{sharePrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsShow() != null) {
-            sql.SET("is_show = #{isShow,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getCurrency() != null) {
-            sql.SET("currency = #{currency,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getOrderOrigin() != null) {
-            sql.SET("order_origin = #{orderOrigin,jdbcType=BIT}");
-        }
-        
-        if (record.getDeliveryId() != null) {
-            sql.SET("delivery_id = #{deliveryId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getDeliveryStatus() != null) {
-            sql.SET("delivery_status = #{deliveryStatus,jdbcType=BIT}");
-        }
-        
-        if (record.getFyStatus() != null) {
-            sql.SET("fy_status = #{fyStatus,jdbcType=BIT}");
-        }
-        
-        if (record.getFyjine() != null) {
-            sql.SET("fyjine = #{fyjine,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getFysingle() != null) {
-            sql.SET("fysingle = #{fysingle,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getMchFyjine() != null) {
-            sql.SET("mch_fyjine = #{mchFyjine,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getMchFysingle() != null) {
-            sql.SET("mch_fysingle = #{mchFysingle,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsFan() != null) {
-            sql.SET("is_fan = #{isFan,jdbcType=BIT}");
-        }
-        
-        if (record.getIsDada() != null) {
-            sql.SET("is_dada = #{isDada,jdbcType=BIT}");
-        }
-        
-        if (record.getShopPeisong() != null) {
-            sql.SET("shop_peisong = #{shopPeisong,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsOpenOffline() != null) {
-            sql.SET("is_open_offline = #{isOpenOffline,jdbcType=BIT}");
-        }
-        
-        if (record.getSupplierId() != null) {
-            sql.SET("supplier_id = #{supplierId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsSupTransfer() != null) {
-            sql.SET("is_sup_transfer = #{isSupTransfer,jdbcType=BIT}");
-        }
-        
-        if (record.getDabaoPrice() != null) {
-            sql.SET("dabao_price = #{dabaoPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getSettlementAmount() != null) {
-            sql.SET("settlement_amount = #{settlementAmount,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsSettlement() != null) {
-            sql.SET("is_settlement = #{isSettlement,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getSettlementTime() != null) {
-            sql.SET("settlement_time = #{settlementTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsMchShop() != null) {
-            sql.SET("is_mch_shop = #{isMchShop,jdbcType=BIT}");
-        }
-        
-        if (record.getIsDivideMoney() != null) {
-            sql.SET("is_divide_money = #{isDivideMoney,jdbcType=BIT}");
-        }
-        
-        if (record.getTransactionId() != null) {
-            sql.SET("transaction_id = #{transactionId,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getPayUserId() != null) {
-            sql.SET("pay_user_id = #{payUserId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getPayTypeTrue() != null) {
-            sql.SET("pay_type_true = #{payTypeTrue,jdbcType=BIT}");
-        }
-        
-        if (record.getIsVgoods() != null) {
-            sql.SET("is_vgoods = #{isVgoods,jdbcType=INTEGER}");
-        }
-        
-        if (record.getReductionPrice() != null) {
-            sql.SET("reduction_price = #{reductionPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getMinusPrice() != null) {
-            sql.SET("minus_price = #{minusPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getOrderFrom() != null) {
-            sql.SET("order_from = #{orderFrom,jdbcType=INTEGER}");
-        }
-        
-        if (record.getDiscountPrice() != null) {
-            sql.SET("discount_price = #{discountPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getDiscountNum() != null) {
-            sql.SET("discount_num = #{discountNum,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getGiveGoodsId() != null) {
-            sql.SET("give_goods_id = #{giveGoodsId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getCouponRecordId() != null) {
-            sql.SET("coupon_record_id = #{couponRecordId,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIdCardNo() != null) {
-            sql.SET("id_card_no = #{idCardNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getRefundTime() != null) {
-            sql.SET("refund_time = #{refundTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getContent() != null) {
-            sql.SET("content = #{content,jdbcType=LONGVARCHAR}");
-        }
-        
-        if (record.getAddressData() != null) {
-            sql.SET("address_data = #{addressData,jdbcType=LONGVARCHAR}");
-        }
-        
-        if (record.getOfflineQrcode() != null) {
-            sql.SET("offline_qrcode = #{offlineQrcode,jdbcType=LONGVARCHAR}");
-        }
-        
-        if (record.getIntegral() != null) {
-            sql.SET("integral = #{integral,jdbcType=LONGVARCHAR}");
-        }
-        
-        if (record.getWords() != null) {
-            sql.SET("words = #{words,jdbcType=LONGVARCHAR}");
-        }
-        
-        if (record.getSellerComments() != null) {
-            sql.SET("seller_comments = #{sellerComments,jdbcType=LONGVARCHAR}");
-        }
-        
-        sql.WHERE("id = #{id,jdbcType=INTEGER}");
-        
-        return sql.toString();
-    }
-
     protected void applyWhere(SQL sql, CyymallOrderExample example, boolean includeExamplePhrase) {
         if (example == null) {
             return;

service/src/main/java/com/hfkj/dao/CyymallUserMapper.java

@@ -3,7 +3,6 @@ package com.hfkj.dao;
 import com.hfkj.entity.CyymallUser;
 import com.hfkj.entity.CyymallUserExample;
 import java.util.List;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.InsertProvider;
@@ -11,9 +10,7 @@ import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.stereotype.Repository;
@@ -32,12 +29,6 @@ public interface CyymallUserMapper extends CyymallUserMapperExt {
     @DeleteProvider(type=CyymallUserSqlProvider.class, method="deleteByExample")
     int deleteByExample(CyymallUserExample example);
 
-    @Delete({
-        "delete from cyymall_user",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    int deleteByPrimaryKey(Integer id);
-
     @Insert({
         "insert into cyymall_user (`type`, username, ",
         "`password`, auth_key, ",
@@ -109,7 +100,7 @@ public interface CyymallUserMapper extends CyymallUserMapperExt {
 
     @SelectProvider(type=CyymallUserSqlProvider.class, method="selectByExample")
     @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
+        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER),
         @Result(column="type", property="type", jdbcType=JdbcType.SMALLINT),
         @Result(column="username", property="username", jdbcType=JdbcType.VARCHAR),
         @Result(column="password", property="password", jdbcType=JdbcType.VARCHAR),
@@ -174,159 +165,9 @@ public interface CyymallUserMapper extends CyymallUserMapperExt {
     })
     List<CyymallUser> selectByExample(CyymallUserExample example);
 
-    @Select({
-        "select",
-        "id, `type`, username, `password`, auth_key, access_token, addtime, is_delete, ",
-        "wechat_open_id, wechat_union_id, nickname, avatar_url, store_id, is_distributor, ",
-        "parent_id, `time`, total_price, price, is_clerk, we7_uid, shop_id, `level`, ",
-        "integral, total_integral, money, contact_way, comments, binding, wechat_platform_open_id, ",
-        "platform, blacklist, parent_user_id, appcid, is_admin, tuan_price, is_delivery, ",
-        "mch_id, real_name, real_code, real_just_pic, real_back_pic, is_real, live_price, ",
-        "fyjine, yifan, delivery_office, subsidy_price, delivery_mch_id, clerk_mch_id, ",
-        "is_group_centre, sex, birth_date, is_vgoods, share_cat_id, user_label, gh_card_no, ",
-        "gh_card_pwd, channel_phone, channel_sign, email, apply_time, apply_status",
-        "from cyymall_user",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    @Results({
-        @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
-        @Result(column="type", property="type", jdbcType=JdbcType.SMALLINT),
-        @Result(column="username", property="username", jdbcType=JdbcType.VARCHAR),
-        @Result(column="password", property="password", jdbcType=JdbcType.VARCHAR),
-        @Result(column="auth_key", property="authKey", jdbcType=JdbcType.VARCHAR),
-        @Result(column="access_token", property="accessToken", jdbcType=JdbcType.VARCHAR),
-        @Result(column="addtime", property="addtime", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_delete", property="isDelete", jdbcType=JdbcType.SMALLINT),
-        @Result(column="wechat_open_id", property="wechatOpenId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="wechat_union_id", property="wechatUnionId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="nickname", property="nickname", jdbcType=JdbcType.VARCHAR),
-        @Result(column="avatar_url", property="avatarUrl", jdbcType=JdbcType.VARCHAR),
-        @Result(column="store_id", property="storeId", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_distributor", property="isDistributor", jdbcType=JdbcType.INTEGER),
-        @Result(column="parent_id", property="parentId", jdbcType=JdbcType.INTEGER),
-        @Result(column="time", property="time", jdbcType=JdbcType.INTEGER),
-        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_clerk", property="isClerk", jdbcType=JdbcType.INTEGER),
-        @Result(column="we7_uid", property="we7Uid", jdbcType=JdbcType.INTEGER),
-        @Result(column="shop_id", property="shopId", jdbcType=JdbcType.INTEGER),
-        @Result(column="level", property="level", jdbcType=JdbcType.INTEGER),
-        @Result(column="integral", property="integral", jdbcType=JdbcType.INTEGER),
-        @Result(column="total_integral", property="totalIntegral", jdbcType=JdbcType.INTEGER),
-        @Result(column="money", property="money", jdbcType=JdbcType.DECIMAL),
-        @Result(column="contact_way", property="contactWay", jdbcType=JdbcType.VARCHAR),
-        @Result(column="comments", property="comments", jdbcType=JdbcType.VARCHAR),
-        @Result(column="binding", property="binding", jdbcType=JdbcType.CHAR),
-        @Result(column="wechat_platform_open_id", property="wechatPlatformOpenId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="platform", property="platform", jdbcType=JdbcType.TINYINT),
-        @Result(column="blacklist", property="blacklist", jdbcType=JdbcType.BIT),
-        @Result(column="parent_user_id", property="parentUserId", jdbcType=JdbcType.INTEGER),
-        @Result(column="appcid", property="appcid", jdbcType=JdbcType.VARCHAR),
-        @Result(column="is_admin", property="isAdmin", jdbcType=JdbcType.BIT),
-        @Result(column="tuan_price", property="tuanPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="is_delivery", property="isDelivery", jdbcType=JdbcType.BIT),
-        @Result(column="mch_id", property="mchId", jdbcType=JdbcType.INTEGER),
-        @Result(column="real_name", property="realName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="real_code", property="realCode", jdbcType=JdbcType.VARCHAR),
-        @Result(column="real_just_pic", property="realJustPic", jdbcType=JdbcType.VARCHAR),
-        @Result(column="real_back_pic", property="realBackPic", jdbcType=JdbcType.VARCHAR),
-        @Result(column="is_real", property="isReal", jdbcType=JdbcType.BIT),
-        @Result(column="live_price", property="livePrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="fyjine", property="fyjine", jdbcType=JdbcType.VARCHAR),
-        @Result(column="yifan", property="yifan", jdbcType=JdbcType.VARCHAR),
-        @Result(column="delivery_office", property="deliveryOffice", jdbcType=JdbcType.BIT),
-        @Result(column="subsidy_price", property="subsidyPrice", jdbcType=JdbcType.DECIMAL),
-        @Result(column="delivery_mch_id", property="deliveryMchId", jdbcType=JdbcType.INTEGER),
-        @Result(column="clerk_mch_id", property="clerkMchId", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_group_centre", property="isGroupCentre", jdbcType=JdbcType.INTEGER),
-        @Result(column="sex", property="sex", jdbcType=JdbcType.INTEGER),
-        @Result(column="birth_date", property="birthDate", jdbcType=JdbcType.VARCHAR),
-        @Result(column="is_vgoods", property="isVgoods", jdbcType=JdbcType.INTEGER),
-        @Result(column="share_cat_id", property="shareCatId", jdbcType=JdbcType.INTEGER),
-        @Result(column="user_label", property="userLabel", jdbcType=JdbcType.INTEGER),
-        @Result(column="gh_card_no", property="ghCardNo", jdbcType=JdbcType.VARCHAR),
-        @Result(column="gh_card_pwd", property="ghCardPwd", jdbcType=JdbcType.INTEGER),
-        @Result(column="channel_phone", property="channelPhone", jdbcType=JdbcType.CHAR),
-        @Result(column="channel_sign", property="channelSign", jdbcType=JdbcType.VARCHAR),
-        @Result(column="email", property="email", jdbcType=JdbcType.VARCHAR),
-        @Result(column="apply_time", property="applyTime", jdbcType=JdbcType.INTEGER),
-        @Result(column="apply_status", property="applyStatus", jdbcType=JdbcType.SMALLINT)
-    })
-    CyymallUser selectByPrimaryKey(Integer id);
-
     @UpdateProvider(type=CyymallUserSqlProvider.class, method="updateByExampleSelective")
     int updateByExampleSelective(@Param("record") CyymallUser record, @Param("example") CyymallUserExample example);
 
     @UpdateProvider(type=CyymallUserSqlProvider.class, method="updateByExample")
     int updateByExample(@Param("record") CyymallUser record, @Param("example") CyymallUserExample example);
-
-    @UpdateProvider(type=CyymallUserSqlProvider.class, method="updateByPrimaryKeySelective")
-    int updateByPrimaryKeySelective(CyymallUser record);
-
-    @Update({
-        "update cyymall_user",
-        "set `type` = #{type,jdbcType=SMALLINT},",
-          "username = #{username,jdbcType=VARCHAR},",
-          "`password` = #{password,jdbcType=VARCHAR},",
-          "auth_key = #{authKey,jdbcType=VARCHAR},",
-          "access_token = #{accessToken,jdbcType=VARCHAR},",
-          "addtime = #{addtime,jdbcType=INTEGER},",
-          "is_delete = #{isDelete,jdbcType=SMALLINT},",
-          "wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR},",
-          "wechat_union_id = #{wechatUnionId,jdbcType=VARCHAR},",
-          "nickname = #{nickname,jdbcType=VARCHAR},",
-          "avatar_url = #{avatarUrl,jdbcType=VARCHAR},",
-          "store_id = #{storeId,jdbcType=INTEGER},",
-          "is_distributor = #{isDistributor,jdbcType=INTEGER},",
-          "parent_id = #{parentId,jdbcType=INTEGER},",
-          "`time` = #{time,jdbcType=INTEGER},",
-          "total_price = #{totalPrice,jdbcType=DECIMAL},",
-          "price = #{price,jdbcType=DECIMAL},",
-          "is_clerk = #{isClerk,jdbcType=INTEGER},",
-          "we7_uid = #{we7Uid,jdbcType=INTEGER},",
-          "shop_id = #{shopId,jdbcType=INTEGER},",
-          "`level` = #{level,jdbcType=INTEGER},",
-          "integral = #{integral,jdbcType=INTEGER},",
-          "total_integral = #{totalIntegral,jdbcType=INTEGER},",
-          "money = #{money,jdbcType=DECIMAL},",
-          "contact_way = #{contactWay,jdbcType=VARCHAR},",
-          "comments = #{comments,jdbcType=VARCHAR},",
-          "binding = #{binding,jdbcType=CHAR},",
-          "wechat_platform_open_id = #{wechatPlatformOpenId,jdbcType=VARCHAR},",
-          "platform = #{platform,jdbcType=TINYINT},",
-          "blacklist = #{blacklist,jdbcType=BIT},",
-          "parent_user_id = #{parentUserId,jdbcType=INTEGER},",
-          "appcid = #{appcid,jdbcType=VARCHAR},",
-          "is_admin = #{isAdmin,jdbcType=BIT},",
-          "tuan_price = #{tuanPrice,jdbcType=DECIMAL},",
-          "is_delivery = #{isDelivery,jdbcType=BIT},",
-          "mch_id = #{mchId,jdbcType=INTEGER},",
-          "real_name = #{realName,jdbcType=VARCHAR},",
-          "real_code = #{realCode,jdbcType=VARCHAR},",
-          "real_just_pic = #{realJustPic,jdbcType=VARCHAR},",
-          "real_back_pic = #{realBackPic,jdbcType=VARCHAR},",
-          "is_real = #{isReal,jdbcType=BIT},",
-          "live_price = #{livePrice,jdbcType=DECIMAL},",
-          "fyjine = #{fyjine,jdbcType=VARCHAR},",
-          "yifan = #{yifan,jdbcType=VARCHAR},",
-          "delivery_office = #{deliveryOffice,jdbcType=BIT},",
-          "subsidy_price = #{subsidyPrice,jdbcType=DECIMAL},",
-          "delivery_mch_id = #{deliveryMchId,jdbcType=INTEGER},",
-          "clerk_mch_id = #{clerkMchId,jdbcType=INTEGER},",
-          "is_group_centre = #{isGroupCentre,jdbcType=INTEGER},",
-          "sex = #{sex,jdbcType=INTEGER},",
-          "birth_date = #{birthDate,jdbcType=VARCHAR},",
-          "is_vgoods = #{isVgoods,jdbcType=INTEGER},",
-          "share_cat_id = #{shareCatId,jdbcType=INTEGER},",
-          "user_label = #{userLabel,jdbcType=INTEGER},",
-          "gh_card_no = #{ghCardNo,jdbcType=VARCHAR},",
-          "gh_card_pwd = #{ghCardPwd,jdbcType=INTEGER},",
-          "channel_phone = #{channelPhone,jdbcType=CHAR},",
-          "channel_sign = #{channelSign,jdbcType=VARCHAR},",
-          "email = #{email,jdbcType=VARCHAR},",
-          "apply_time = #{applyTime,jdbcType=INTEGER},",
-          "apply_status = #{applyStatus,jdbcType=SMALLINT}",
-        "where id = #{id,jdbcType=INTEGER}"
-    })
-    int updateByPrimaryKey(CyymallUser record);
 }

service/src/main/java/com/hfkj/dao/CyymallUserSqlProvider.java

@@ -684,259 +684,6 @@ public class CyymallUserSqlProvider {
         return sql.toString();
     }
 
-    public String updateByPrimaryKeySelective(CyymallUser record) {
-        SQL sql = new SQL();
-        sql.UPDATE("cyymall_user");
-        
-        if (record.getType() != null) {
-            sql.SET("`type` = #{type,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getUsername() != null) {
-            sql.SET("username = #{username,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getPassword() != null) {
-            sql.SET("`password` = #{password,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getAuthKey() != null) {
-            sql.SET("auth_key = #{authKey,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getAccessToken() != null) {
-            sql.SET("access_token = #{accessToken,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getAddtime() != null) {
-            sql.SET("addtime = #{addtime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsDelete() != null) {
-            sql.SET("is_delete = #{isDelete,jdbcType=SMALLINT}");
-        }
-        
-        if (record.getWechatOpenId() != null) {
-            sql.SET("wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getWechatUnionId() != null) {
-            sql.SET("wechat_union_id = #{wechatUnionId,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getNickname() != null) {
-            sql.SET("nickname = #{nickname,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getAvatarUrl() != null) {
-            sql.SET("avatar_url = #{avatarUrl,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getStoreId() != null) {
-            sql.SET("store_id = #{storeId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsDistributor() != null) {
-            sql.SET("is_distributor = #{isDistributor,jdbcType=INTEGER}");
-        }
-        
-        if (record.getParentId() != null) {
-            sql.SET("parent_id = #{parentId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getTime() != null) {
-            sql.SET("`time` = #{time,jdbcType=INTEGER}");
-        }
-        
-        if (record.getTotalPrice() != null) {
-            sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getPrice() != null) {
-            sql.SET("price = #{price,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsClerk() != null) {
-            sql.SET("is_clerk = #{isClerk,jdbcType=INTEGER}");
-        }
-        
-        if (record.getWe7Uid() != null) {
-            sql.SET("we7_uid = #{we7Uid,jdbcType=INTEGER}");
-        }
-        
-        if (record.getShopId() != null) {
-            sql.SET("shop_id = #{shopId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getLevel() != null) {
-            sql.SET("`level` = #{level,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIntegral() != null) {
-            sql.SET("integral = #{integral,jdbcType=INTEGER}");
-        }
-        
-        if (record.getTotalIntegral() != null) {
-            sql.SET("total_integral = #{totalIntegral,jdbcType=INTEGER}");
-        }
-        
-        if (record.getMoney() != null) {
-            sql.SET("money = #{money,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getContactWay() != null) {
-            sql.SET("contact_way = #{contactWay,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getComments() != null) {
-            sql.SET("comments = #{comments,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getBinding() != null) {
-            sql.SET("binding = #{binding,jdbcType=CHAR}");
-        }
-        
-        if (record.getWechatPlatformOpenId() != null) {
-            sql.SET("wechat_platform_open_id = #{wechatPlatformOpenId,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getPlatform() != null) {
-            sql.SET("platform = #{platform,jdbcType=TINYINT}");
-        }
-        
-        if (record.getBlacklist() != null) {
-            sql.SET("blacklist = #{blacklist,jdbcType=BIT}");
-        }
-        
-        if (record.getParentUserId() != null) {
-            sql.SET("parent_user_id = #{parentUserId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getAppcid() != null) {
-            sql.SET("appcid = #{appcid,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIsAdmin() != null) {
-            sql.SET("is_admin = #{isAdmin,jdbcType=BIT}");
-        }
-        
-        if (record.getTuanPrice() != null) {
-            sql.SET("tuan_price = #{tuanPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getIsDelivery() != null) {
-            sql.SET("is_delivery = #{isDelivery,jdbcType=BIT}");
-        }
-        
-        if (record.getMchId() != null) {
-            sql.SET("mch_id = #{mchId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getRealName() != null) {
-            sql.SET("real_name = #{realName,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getRealCode() != null) {
-            sql.SET("real_code = #{realCode,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getRealJustPic() != null) {
-            sql.SET("real_just_pic = #{realJustPic,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getRealBackPic() != null) {
-            sql.SET("real_back_pic = #{realBackPic,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIsReal() != null) {
-            sql.SET("is_real = #{isReal,jdbcType=BIT}");
-        }
-        
-        if (record.getLivePrice() != null) {
-            sql.SET("live_price = #{livePrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getFyjine() != null) {
-            sql.SET("fyjine = #{fyjine,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getYifan() != null) {
-            sql.SET("yifan = #{yifan,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getDeliveryOffice() != null) {
-            sql.SET("delivery_office = #{deliveryOffice,jdbcType=BIT}");
-        }
-        
-        if (record.getSubsidyPrice() != null) {
-            sql.SET("subsidy_price = #{subsidyPrice,jdbcType=DECIMAL}");
-        }
-        
-        if (record.getDeliveryMchId() != null) {
-            sql.SET("delivery_mch_id = #{deliveryMchId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getClerkMchId() != null) {
-            sql.SET("clerk_mch_id = #{clerkMchId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getIsGroupCentre() != null) {
-            sql.SET("is_group_centre = #{isGroupCentre,jdbcType=INTEGER}");
-        }
-        
-        if (record.getSex() != null) {
-            sql.SET("sex = #{sex,jdbcType=INTEGER}");
-        }
-        
-        if (record.getBirthDate() != null) {
-            sql.SET("birth_date = #{birthDate,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getIsVgoods() != null) {
-            sql.SET("is_vgoods = #{isVgoods,jdbcType=INTEGER}");
-        }
-        
-        if (record.getShareCatId() != null) {
-            sql.SET("share_cat_id = #{shareCatId,jdbcType=INTEGER}");
-        }
-        
-        if (record.getUserLabel() != null) {
-            sql.SET("user_label = #{userLabel,jdbcType=INTEGER}");
-        }
-        
-        if (record.getGhCardNo() != null) {
-            sql.SET("gh_card_no = #{ghCardNo,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getGhCardPwd() != null) {
-            sql.SET("gh_card_pwd = #{ghCardPwd,jdbcType=INTEGER}");
-        }
-        
-        if (record.getChannelPhone() != null) {
-            sql.SET("channel_phone = #{channelPhone,jdbcType=CHAR}");
-        }
-        
-        if (record.getChannelSign() != null) {
-            sql.SET("channel_sign = #{channelSign,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getEmail() != null) {
-            sql.SET("email = #{email,jdbcType=VARCHAR}");
-        }
-        
-        if (record.getApplyTime() != null) {
-            sql.SET("apply_time = #{applyTime,jdbcType=INTEGER}");
-        }
-        
-        if (record.getApplyStatus() != null) {
-            sql.SET("apply_status = #{applyStatus,jdbcType=SMALLINT}");
-        }
-        
-        sql.WHERE("id = #{id,jdbcType=INTEGER}");
-        
-        return sql.toString();
-    }
-
     protected void applyWhere(SQL sql, CyymallUserExample example, boolean includeExamplePhrase) {
         if (example == null) {
             return;

service/src/main/java/com/hfkj/entity/CyymallAddress.java

@@ -0,0 +1,269 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+
+/**
+ * cyymall_address
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class CyymallAddress implements Serializable {
+    private Integer id;
+
+    private Integer storeId;
+
+    private Integer userId;
+
+    private String name;
+
+    private String mobile;
+
+    private Integer provinceId;
+
+    private String province;
+
+    private Integer cityId;
+
+    private String city;
+
+    private Integer districtId;
+
+    private String district;
+
+    private String detail;
+
+    private Short isDefault;
+
+    private Integer addtime;
+
+    private Short isDelete;
+
+    private String latitude;
+
+    private String longitude;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Integer provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public Integer getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Integer cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public Integer getDistrictId() {
+        return districtId;
+    }
+
+    public void setDistrictId(Integer districtId) {
+        this.districtId = districtId;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public Short getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(Short isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public Integer getAddtime() {
+        return addtime;
+    }
+
+    public void setAddtime(Integer addtime) {
+        this.addtime = addtime;
+    }
+
+    public Short getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        CyymallAddress other = (CyymallAddress) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile()))
+            && (this.getProvinceId() == null ? other.getProvinceId() == null : this.getProvinceId().equals(other.getProvinceId()))
+            && (this.getProvince() == null ? other.getProvince() == null : this.getProvince().equals(other.getProvince()))
+            && (this.getCityId() == null ? other.getCityId() == null : this.getCityId().equals(other.getCityId()))
+            && (this.getCity() == null ? other.getCity() == null : this.getCity().equals(other.getCity()))
+            && (this.getDistrictId() == null ? other.getDistrictId() == null : this.getDistrictId().equals(other.getDistrictId()))
+            && (this.getDistrict() == null ? other.getDistrict() == null : this.getDistrict().equals(other.getDistrict()))
+            && (this.getDetail() == null ? other.getDetail() == null : this.getDetail().equals(other.getDetail()))
+            && (this.getIsDefault() == null ? other.getIsDefault() == null : this.getIsDefault().equals(other.getIsDefault()))
+            && (this.getAddtime() == null ? other.getAddtime() == null : this.getAddtime().equals(other.getAddtime()))
+            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+            && (this.getLatitude() == null ? other.getLatitude() == null : this.getLatitude().equals(other.getLatitude()))
+            && (this.getLongitude() == null ? other.getLongitude() == null : this.getLongitude().equals(other.getLongitude()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode());
+        result = prime * result + ((getProvinceId() == null) ? 0 : getProvinceId().hashCode());
+        result = prime * result + ((getProvince() == null) ? 0 : getProvince().hashCode());
+        result = prime * result + ((getCityId() == null) ? 0 : getCityId().hashCode());
+        result = prime * result + ((getCity() == null) ? 0 : getCity().hashCode());
+        result = prime * result + ((getDistrictId() == null) ? 0 : getDistrictId().hashCode());
+        result = prime * result + ((getDistrict() == null) ? 0 : getDistrict().hashCode());
+        result = prime * result + ((getDetail() == null) ? 0 : getDetail().hashCode());
+        result = prime * result + ((getIsDefault() == null) ? 0 : getIsDefault().hashCode());
+        result = prime * result + ((getAddtime() == null) ? 0 : getAddtime().hashCode());
+        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+        result = prime * result + ((getLatitude() == null) ? 0 : getLatitude().hashCode());
+        result = prime * result + ((getLongitude() == null) ? 0 : getLongitude().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", storeId=").append(storeId);
+        sb.append(", userId=").append(userId);
+        sb.append(", name=").append(name);
+        sb.append(", mobile=").append(mobile);
+        sb.append(", provinceId=").append(provinceId);
+        sb.append(", province=").append(province);
+        sb.append(", cityId=").append(cityId);
+        sb.append(", city=").append(city);
+        sb.append(", districtId=").append(districtId);
+        sb.append(", district=").append(district);
+        sb.append(", detail=").append(detail);
+        sb.append(", isDefault=").append(isDefault);
+        sb.append(", addtime=").append(addtime);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/entity/CyymallGoods.java

@@ -0,0 +1,842 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * cyymall_goods
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class CyymallGoods implements Serializable {
+    private Integer id;
+
+    private Integer storeId;
+
+    private String name;
+
+    private BigDecimal price;
+
+    private BigDecimal originalPrice;
+
+    private Integer catId;
+
+    private Short status;
+
+    private Integer addtime;
+
+    private Short isDelete;
+
+    private String service;
+
+    private Integer sort;
+
+    private Integer virtualSales;
+
+    private String videoUrl;
+
+    private String unit;
+
+    private Short individualShare;
+
+    private BigDecimal shareCommissionFirst;
+
+    private BigDecimal shareCommissionSecond;
+
+    private BigDecimal shareCommissionThird;
+
+    private Double weight;
+
+    private Integer freight;
+
+    private Short useAttr;
+
+    private Integer shareType;
+
+    private Short quickPurchase;
+
+    private Short hotCakes;
+
+    private BigDecimal costPrice;
+
+    private Short memberDiscount;
+
+    private BigDecimal rebate;
+
+    private Integer mchId;
+
+    private Integer goodsNum;
+
+    private Integer mchSort;
+
+    private Integer confineCount;
+
+    private Short isLevel;
+
+    private Short type;
+
+    private Short isNegotiable;
+
+    private Boolean attrSettingType;
+
+    private Long views;
+
+    private BigDecimal supplierPrice;
+
+    private Integer supplierGoodsId;
+
+    private Integer supplierId;
+
+    private String goodsShareTitle;
+
+    private String goodsShareLogo;
+
+    private String goodsShareDesc;
+
+    private Integer isExamine;
+
+    private BigDecimal dabaoPrice;
+
+    private Integer brandId;
+
+    private String keyWord;
+
+    private Integer buyingMethod;
+
+    private Integer buyingMethodLevel;
+
+    private Integer homeBlockId;
+
+    private Integer newIndividualShare;
+
+    private Integer newAttrSettingType;
+
+    private BigDecimal shareCommissionBase;
+
+    private Short isSjht;
+
+    private String sjhtProident;
+
+    private Short isOil;
+
+    private String oilCoutypecode;
+
+    private Short isAbholung;
+
+    private Short isTransnational;
+
+    private Integer goodsTransferRate;
+
+    private Integer oilDiscount;
+
+    private Integer oilType;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
+
+    public Integer getCatId() {
+        return catId;
+    }
+
+    public void setCatId(Integer catId) {
+        this.catId = catId;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public Integer getAddtime() {
+        return addtime;
+    }
+
+    public void setAddtime(Integer addtime) {
+        this.addtime = addtime;
+    }
+
+    public Short getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public void setService(String service) {
+        this.service = service;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getVirtualSales() {
+        return virtualSales;
+    }
+
+    public void setVirtualSales(Integer virtualSales) {
+        this.virtualSales = virtualSales;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Short getIndividualShare() {
+        return individualShare;
+    }
+
+    public void setIndividualShare(Short individualShare) {
+        this.individualShare = individualShare;
+    }
+
+    public BigDecimal getShareCommissionFirst() {
+        return shareCommissionFirst;
+    }
+
+    public void setShareCommissionFirst(BigDecimal shareCommissionFirst) {
+        this.shareCommissionFirst = shareCommissionFirst;
+    }
+
+    public BigDecimal getShareCommissionSecond() {
+        return shareCommissionSecond;
+    }
+
+    public void setShareCommissionSecond(BigDecimal shareCommissionSecond) {
+        this.shareCommissionSecond = shareCommissionSecond;
+    }
+
+    public BigDecimal getShareCommissionThird() {
+        return shareCommissionThird;
+    }
+
+    public void setShareCommissionThird(BigDecimal shareCommissionThird) {
+        this.shareCommissionThird = shareCommissionThird;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public Integer getFreight() {
+        return freight;
+    }
+
+    public void setFreight(Integer freight) {
+        this.freight = freight;
+    }
+
+    public Short getUseAttr() {
+        return useAttr;
+    }
+
+    public void setUseAttr(Short useAttr) {
+        this.useAttr = useAttr;
+    }
+
+    public Integer getShareType() {
+        return shareType;
+    }
+
+    public void setShareType(Integer shareType) {
+        this.shareType = shareType;
+    }
+
+    public Short getQuickPurchase() {
+        return quickPurchase;
+    }
+
+    public void setQuickPurchase(Short quickPurchase) {
+        this.quickPurchase = quickPurchase;
+    }
+
+    public Short getHotCakes() {
+        return hotCakes;
+    }
+
+    public void setHotCakes(Short hotCakes) {
+        this.hotCakes = hotCakes;
+    }
+
+    public BigDecimal getCostPrice() {
+        return costPrice;
+    }
+
+    public void setCostPrice(BigDecimal costPrice) {
+        this.costPrice = costPrice;
+    }
+
+    public Short getMemberDiscount() {
+        return memberDiscount;
+    }
+
+    public void setMemberDiscount(Short memberDiscount) {
+        this.memberDiscount = memberDiscount;
+    }
+
+    public BigDecimal getRebate() {
+        return rebate;
+    }
+
+    public void setRebate(BigDecimal rebate) {
+        this.rebate = rebate;
+    }
+
+    public Integer getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Integer mchId) {
+        this.mchId = mchId;
+    }
+
+    public Integer getGoodsNum() {
+        return goodsNum;
+    }
+
+    public void setGoodsNum(Integer goodsNum) {
+        this.goodsNum = goodsNum;
+    }
+
+    public Integer getMchSort() {
+        return mchSort;
+    }
+
+    public void setMchSort(Integer mchSort) {
+        this.mchSort = mchSort;
+    }
+
+    public Integer getConfineCount() {
+        return confineCount;
+    }
+
+    public void setConfineCount(Integer confineCount) {
+        this.confineCount = confineCount;
+    }
+
+    public Short getIsLevel() {
+        return isLevel;
+    }
+
+    public void setIsLevel(Short isLevel) {
+        this.isLevel = isLevel;
+    }
+
+    public Short getType() {
+        return type;
+    }
+
+    public void setType(Short type) {
+        this.type = type;
+    }
+
+    public Short getIsNegotiable() {
+        return isNegotiable;
+    }
+
+    public void setIsNegotiable(Short isNegotiable) {
+        this.isNegotiable = isNegotiable;
+    }
+
+    public Boolean getAttrSettingType() {
+        return attrSettingType;
+    }
+
+    public void setAttrSettingType(Boolean attrSettingType) {
+        this.attrSettingType = attrSettingType;
+    }
+
+    public Long getViews() {
+        return views;
+    }
+
+    public void setViews(Long views) {
+        this.views = views;
+    }
+
+    public BigDecimal getSupplierPrice() {
+        return supplierPrice;
+    }
+
+    public void setSupplierPrice(BigDecimal supplierPrice) {
+        this.supplierPrice = supplierPrice;
+    }
+
+    public Integer getSupplierGoodsId() {
+        return supplierGoodsId;
+    }
+
+    public void setSupplierGoodsId(Integer supplierGoodsId) {
+        this.supplierGoodsId = supplierGoodsId;
+    }
+
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public String getGoodsShareTitle() {
+        return goodsShareTitle;
+    }
+
+    public void setGoodsShareTitle(String goodsShareTitle) {
+        this.goodsShareTitle = goodsShareTitle;
+    }
+
+    public String getGoodsShareLogo() {
+        return goodsShareLogo;
+    }
+
+    public void setGoodsShareLogo(String goodsShareLogo) {
+        this.goodsShareLogo = goodsShareLogo;
+    }
+
+    public String getGoodsShareDesc() {
+        return goodsShareDesc;
+    }
+
+    public void setGoodsShareDesc(String goodsShareDesc) {
+        this.goodsShareDesc = goodsShareDesc;
+    }
+
+    public Integer getIsExamine() {
+        return isExamine;
+    }
+
+    public void setIsExamine(Integer isExamine) {
+        this.isExamine = isExamine;
+    }
+
+    public BigDecimal getDabaoPrice() {
+        return dabaoPrice;
+    }
+
+    public void setDabaoPrice(BigDecimal dabaoPrice) {
+        this.dabaoPrice = dabaoPrice;
+    }
+
+    public Integer getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Integer brandId) {
+        this.brandId = brandId;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public Integer getBuyingMethod() {
+        return buyingMethod;
+    }
+
+    public void setBuyingMethod(Integer buyingMethod) {
+        this.buyingMethod = buyingMethod;
+    }
+
+    public Integer getBuyingMethodLevel() {
+        return buyingMethodLevel;
+    }
+
+    public void setBuyingMethodLevel(Integer buyingMethodLevel) {
+        this.buyingMethodLevel = buyingMethodLevel;
+    }
+
+    public Integer getHomeBlockId() {
+        return homeBlockId;
+    }
+
+    public void setHomeBlockId(Integer homeBlockId) {
+        this.homeBlockId = homeBlockId;
+    }
+
+    public Integer getNewIndividualShare() {
+        return newIndividualShare;
+    }
+
+    public void setNewIndividualShare(Integer newIndividualShare) {
+        this.newIndividualShare = newIndividualShare;
+    }
+
+    public Integer getNewAttrSettingType() {
+        return newAttrSettingType;
+    }
+
+    public void setNewAttrSettingType(Integer newAttrSettingType) {
+        this.newAttrSettingType = newAttrSettingType;
+    }
+
+    public BigDecimal getShareCommissionBase() {
+        return shareCommissionBase;
+    }
+
+    public void setShareCommissionBase(BigDecimal shareCommissionBase) {
+        this.shareCommissionBase = shareCommissionBase;
+    }
+
+    public Short getIsSjht() {
+        return isSjht;
+    }
+
+    public void setIsSjht(Short isSjht) {
+        this.isSjht = isSjht;
+    }
+
+    public String getSjhtProident() {
+        return sjhtProident;
+    }
+
+    public void setSjhtProident(String sjhtProident) {
+        this.sjhtProident = sjhtProident;
+    }
+
+    public Short getIsOil() {
+        return isOil;
+    }
+
+    public void setIsOil(Short isOil) {
+        this.isOil = isOil;
+    }
+
+    public String getOilCoutypecode() {
+        return oilCoutypecode;
+    }
+
+    public void setOilCoutypecode(String oilCoutypecode) {
+        this.oilCoutypecode = oilCoutypecode;
+    }
+
+    public Short getIsAbholung() {
+        return isAbholung;
+    }
+
+    public void setIsAbholung(Short isAbholung) {
+        this.isAbholung = isAbholung;
+    }
+
+    public Short getIsTransnational() {
+        return isTransnational;
+    }
+
+    public void setIsTransnational(Short isTransnational) {
+        this.isTransnational = isTransnational;
+    }
+
+    public Integer getGoodsTransferRate() {
+        return goodsTransferRate;
+    }
+
+    public void setGoodsTransferRate(Integer goodsTransferRate) {
+        this.goodsTransferRate = goodsTransferRate;
+    }
+
+    public Integer getOilDiscount() {
+        return oilDiscount;
+    }
+
+    public void setOilDiscount(Integer oilDiscount) {
+        this.oilDiscount = oilDiscount;
+    }
+
+    public Integer getOilType() {
+        return oilType;
+    }
+
+    public void setOilType(Integer oilType) {
+        this.oilType = oilType;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        CyymallGoods other = (CyymallGoods) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
+            && (this.getOriginalPrice() == null ? other.getOriginalPrice() == null : this.getOriginalPrice().equals(other.getOriginalPrice()))
+            && (this.getCatId() == null ? other.getCatId() == null : this.getCatId().equals(other.getCatId()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getAddtime() == null ? other.getAddtime() == null : this.getAddtime().equals(other.getAddtime()))
+            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+            && (this.getService() == null ? other.getService() == null : this.getService().equals(other.getService()))
+            && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort()))
+            && (this.getVirtualSales() == null ? other.getVirtualSales() == null : this.getVirtualSales().equals(other.getVirtualSales()))
+            && (this.getVideoUrl() == null ? other.getVideoUrl() == null : this.getVideoUrl().equals(other.getVideoUrl()))
+            && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit()))
+            && (this.getIndividualShare() == null ? other.getIndividualShare() == null : this.getIndividualShare().equals(other.getIndividualShare()))
+            && (this.getShareCommissionFirst() == null ? other.getShareCommissionFirst() == null : this.getShareCommissionFirst().equals(other.getShareCommissionFirst()))
+            && (this.getShareCommissionSecond() == null ? other.getShareCommissionSecond() == null : this.getShareCommissionSecond().equals(other.getShareCommissionSecond()))
+            && (this.getShareCommissionThird() == null ? other.getShareCommissionThird() == null : this.getShareCommissionThird().equals(other.getShareCommissionThird()))
+            && (this.getWeight() == null ? other.getWeight() == null : this.getWeight().equals(other.getWeight()))
+            && (this.getFreight() == null ? other.getFreight() == null : this.getFreight().equals(other.getFreight()))
+            && (this.getUseAttr() == null ? other.getUseAttr() == null : this.getUseAttr().equals(other.getUseAttr()))
+            && (this.getShareType() == null ? other.getShareType() == null : this.getShareType().equals(other.getShareType()))
+            && (this.getQuickPurchase() == null ? other.getQuickPurchase() == null : this.getQuickPurchase().equals(other.getQuickPurchase()))
+            && (this.getHotCakes() == null ? other.getHotCakes() == null : this.getHotCakes().equals(other.getHotCakes()))
+            && (this.getCostPrice() == null ? other.getCostPrice() == null : this.getCostPrice().equals(other.getCostPrice()))
+            && (this.getMemberDiscount() == null ? other.getMemberDiscount() == null : this.getMemberDiscount().equals(other.getMemberDiscount()))
+            && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
+            && (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId()))
+            && (this.getGoodsNum() == null ? other.getGoodsNum() == null : this.getGoodsNum().equals(other.getGoodsNum()))
+            && (this.getMchSort() == null ? other.getMchSort() == null : this.getMchSort().equals(other.getMchSort()))
+            && (this.getConfineCount() == null ? other.getConfineCount() == null : this.getConfineCount().equals(other.getConfineCount()))
+            && (this.getIsLevel() == null ? other.getIsLevel() == null : this.getIsLevel().equals(other.getIsLevel()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getIsNegotiable() == null ? other.getIsNegotiable() == null : this.getIsNegotiable().equals(other.getIsNegotiable()))
+            && (this.getAttrSettingType() == null ? other.getAttrSettingType() == null : this.getAttrSettingType().equals(other.getAttrSettingType()))
+            && (this.getViews() == null ? other.getViews() == null : this.getViews().equals(other.getViews()))
+            && (this.getSupplierPrice() == null ? other.getSupplierPrice() == null : this.getSupplierPrice().equals(other.getSupplierPrice()))
+            && (this.getSupplierGoodsId() == null ? other.getSupplierGoodsId() == null : this.getSupplierGoodsId().equals(other.getSupplierGoodsId()))
+            && (this.getSupplierId() == null ? other.getSupplierId() == null : this.getSupplierId().equals(other.getSupplierId()))
+            && (this.getGoodsShareTitle() == null ? other.getGoodsShareTitle() == null : this.getGoodsShareTitle().equals(other.getGoodsShareTitle()))
+            && (this.getGoodsShareLogo() == null ? other.getGoodsShareLogo() == null : this.getGoodsShareLogo().equals(other.getGoodsShareLogo()))
+            && (this.getGoodsShareDesc() == null ? other.getGoodsShareDesc() == null : this.getGoodsShareDesc().equals(other.getGoodsShareDesc()))
+            && (this.getIsExamine() == null ? other.getIsExamine() == null : this.getIsExamine().equals(other.getIsExamine()))
+            && (this.getDabaoPrice() == null ? other.getDabaoPrice() == null : this.getDabaoPrice().equals(other.getDabaoPrice()))
+            && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId()))
+            && (this.getKeyWord() == null ? other.getKeyWord() == null : this.getKeyWord().equals(other.getKeyWord()))
+            && (this.getBuyingMethod() == null ? other.getBuyingMethod() == null : this.getBuyingMethod().equals(other.getBuyingMethod()))
+            && (this.getBuyingMethodLevel() == null ? other.getBuyingMethodLevel() == null : this.getBuyingMethodLevel().equals(other.getBuyingMethodLevel()))
+            && (this.getHomeBlockId() == null ? other.getHomeBlockId() == null : this.getHomeBlockId().equals(other.getHomeBlockId()))
+            && (this.getNewIndividualShare() == null ? other.getNewIndividualShare() == null : this.getNewIndividualShare().equals(other.getNewIndividualShare()))
+            && (this.getNewAttrSettingType() == null ? other.getNewAttrSettingType() == null : this.getNewAttrSettingType().equals(other.getNewAttrSettingType()))
+            && (this.getShareCommissionBase() == null ? other.getShareCommissionBase() == null : this.getShareCommissionBase().equals(other.getShareCommissionBase()))
+            && (this.getIsSjht() == null ? other.getIsSjht() == null : this.getIsSjht().equals(other.getIsSjht()))
+            && (this.getSjhtProident() == null ? other.getSjhtProident() == null : this.getSjhtProident().equals(other.getSjhtProident()))
+            && (this.getIsOil() == null ? other.getIsOil() == null : this.getIsOil().equals(other.getIsOil()))
+            && (this.getOilCoutypecode() == null ? other.getOilCoutypecode() == null : this.getOilCoutypecode().equals(other.getOilCoutypecode()))
+            && (this.getIsAbholung() == null ? other.getIsAbholung() == null : this.getIsAbholung().equals(other.getIsAbholung()))
+            && (this.getIsTransnational() == null ? other.getIsTransnational() == null : this.getIsTransnational().equals(other.getIsTransnational()))
+            && (this.getGoodsTransferRate() == null ? other.getGoodsTransferRate() == null : this.getGoodsTransferRate().equals(other.getGoodsTransferRate()))
+            && (this.getOilDiscount() == null ? other.getOilDiscount() == null : this.getOilDiscount().equals(other.getOilDiscount()))
+            && (this.getOilType() == null ? other.getOilType() == null : this.getOilType().equals(other.getOilType()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
+        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
+        result = prime * result + ((getOriginalPrice() == null) ? 0 : getOriginalPrice().hashCode());
+        result = prime * result + ((getCatId() == null) ? 0 : getCatId().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getAddtime() == null) ? 0 : getAddtime().hashCode());
+        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+        result = prime * result + ((getService() == null) ? 0 : getService().hashCode());
+        result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode());
+        result = prime * result + ((getVirtualSales() == null) ? 0 : getVirtualSales().hashCode());
+        result = prime * result + ((getVideoUrl() == null) ? 0 : getVideoUrl().hashCode());
+        result = prime * result + ((getUnit() == null) ? 0 : getUnit().hashCode());
+        result = prime * result + ((getIndividualShare() == null) ? 0 : getIndividualShare().hashCode());
+        result = prime * result + ((getShareCommissionFirst() == null) ? 0 : getShareCommissionFirst().hashCode());
+        result = prime * result + ((getShareCommissionSecond() == null) ? 0 : getShareCommissionSecond().hashCode());
+        result = prime * result + ((getShareCommissionThird() == null) ? 0 : getShareCommissionThird().hashCode());
+        result = prime * result + ((getWeight() == null) ? 0 : getWeight().hashCode());
+        result = prime * result + ((getFreight() == null) ? 0 : getFreight().hashCode());
+        result = prime * result + ((getUseAttr() == null) ? 0 : getUseAttr().hashCode());
+        result = prime * result + ((getShareType() == null) ? 0 : getShareType().hashCode());
+        result = prime * result + ((getQuickPurchase() == null) ? 0 : getQuickPurchase().hashCode());
+        result = prime * result + ((getHotCakes() == null) ? 0 : getHotCakes().hashCode());
+        result = prime * result + ((getCostPrice() == null) ? 0 : getCostPrice().hashCode());
+        result = prime * result + ((getMemberDiscount() == null) ? 0 : getMemberDiscount().hashCode());
+        result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
+        result = prime * result + ((getMchId() == null) ? 0 : getMchId().hashCode());
+        result = prime * result + ((getGoodsNum() == null) ? 0 : getGoodsNum().hashCode());
+        result = prime * result + ((getMchSort() == null) ? 0 : getMchSort().hashCode());
+        result = prime * result + ((getConfineCount() == null) ? 0 : getConfineCount().hashCode());
+        result = prime * result + ((getIsLevel() == null) ? 0 : getIsLevel().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getIsNegotiable() == null) ? 0 : getIsNegotiable().hashCode());
+        result = prime * result + ((getAttrSettingType() == null) ? 0 : getAttrSettingType().hashCode());
+        result = prime * result + ((getViews() == null) ? 0 : getViews().hashCode());
+        result = prime * result + ((getSupplierPrice() == null) ? 0 : getSupplierPrice().hashCode());
+        result = prime * result + ((getSupplierGoodsId() == null) ? 0 : getSupplierGoodsId().hashCode());
+        result = prime * result + ((getSupplierId() == null) ? 0 : getSupplierId().hashCode());
+        result = prime * result + ((getGoodsShareTitle() == null) ? 0 : getGoodsShareTitle().hashCode());
+        result = prime * result + ((getGoodsShareLogo() == null) ? 0 : getGoodsShareLogo().hashCode());
+        result = prime * result + ((getGoodsShareDesc() == null) ? 0 : getGoodsShareDesc().hashCode());
+        result = prime * result + ((getIsExamine() == null) ? 0 : getIsExamine().hashCode());
+        result = prime * result + ((getDabaoPrice() == null) ? 0 : getDabaoPrice().hashCode());
+        result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode());
+        result = prime * result + ((getKeyWord() == null) ? 0 : getKeyWord().hashCode());
+        result = prime * result + ((getBuyingMethod() == null) ? 0 : getBuyingMethod().hashCode());
+        result = prime * result + ((getBuyingMethodLevel() == null) ? 0 : getBuyingMethodLevel().hashCode());
+        result = prime * result + ((getHomeBlockId() == null) ? 0 : getHomeBlockId().hashCode());
+        result = prime * result + ((getNewIndividualShare() == null) ? 0 : getNewIndividualShare().hashCode());
+        result = prime * result + ((getNewAttrSettingType() == null) ? 0 : getNewAttrSettingType().hashCode());
+        result = prime * result + ((getShareCommissionBase() == null) ? 0 : getShareCommissionBase().hashCode());
+        result = prime * result + ((getIsSjht() == null) ? 0 : getIsSjht().hashCode());
+        result = prime * result + ((getSjhtProident() == null) ? 0 : getSjhtProident().hashCode());
+        result = prime * result + ((getIsOil() == null) ? 0 : getIsOil().hashCode());
+        result = prime * result + ((getOilCoutypecode() == null) ? 0 : getOilCoutypecode().hashCode());
+        result = prime * result + ((getIsAbholung() == null) ? 0 : getIsAbholung().hashCode());
+        result = prime * result + ((getIsTransnational() == null) ? 0 : getIsTransnational().hashCode());
+        result = prime * result + ((getGoodsTransferRate() == null) ? 0 : getGoodsTransferRate().hashCode());
+        result = prime * result + ((getOilDiscount() == null) ? 0 : getOilDiscount().hashCode());
+        result = prime * result + ((getOilType() == null) ? 0 : getOilType().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", storeId=").append(storeId);
+        sb.append(", name=").append(name);
+        sb.append(", price=").append(price);
+        sb.append(", originalPrice=").append(originalPrice);
+        sb.append(", catId=").append(catId);
+        sb.append(", status=").append(status);
+        sb.append(", addtime=").append(addtime);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", service=").append(service);
+        sb.append(", sort=").append(sort);
+        sb.append(", virtualSales=").append(virtualSales);
+        sb.append(", videoUrl=").append(videoUrl);
+        sb.append(", unit=").append(unit);
+        sb.append(", individualShare=").append(individualShare);
+        sb.append(", shareCommissionFirst=").append(shareCommissionFirst);
+        sb.append(", shareCommissionSecond=").append(shareCommissionSecond);
+        sb.append(", shareCommissionThird=").append(shareCommissionThird);
+        sb.append(", weight=").append(weight);
+        sb.append(", freight=").append(freight);
+        sb.append(", useAttr=").append(useAttr);
+        sb.append(", shareType=").append(shareType);
+        sb.append(", quickPurchase=").append(quickPurchase);
+        sb.append(", hotCakes=").append(hotCakes);
+        sb.append(", costPrice=").append(costPrice);
+        sb.append(", memberDiscount=").append(memberDiscount);
+        sb.append(", rebate=").append(rebate);
+        sb.append(", mchId=").append(mchId);
+        sb.append(", goodsNum=").append(goodsNum);
+        sb.append(", mchSort=").append(mchSort);
+        sb.append(", confineCount=").append(confineCount);
+        sb.append(", isLevel=").append(isLevel);
+        sb.append(", type=").append(type);
+        sb.append(", isNegotiable=").append(isNegotiable);
+        sb.append(", attrSettingType=").append(attrSettingType);
+        sb.append(", views=").append(views);
+        sb.append(", supplierPrice=").append(supplierPrice);
+        sb.append(", supplierGoodsId=").append(supplierGoodsId);
+        sb.append(", supplierId=").append(supplierId);
+        sb.append(", goodsShareTitle=").append(goodsShareTitle);
+        sb.append(", goodsShareLogo=").append(goodsShareLogo);
+        sb.append(", goodsShareDesc=").append(goodsShareDesc);
+        sb.append(", isExamine=").append(isExamine);
+        sb.append(", dabaoPrice=").append(dabaoPrice);
+        sb.append(", brandId=").append(brandId);
+        sb.append(", keyWord=").append(keyWord);
+        sb.append(", buyingMethod=").append(buyingMethod);
+        sb.append(", buyingMethodLevel=").append(buyingMethodLevel);
+        sb.append(", homeBlockId=").append(homeBlockId);
+        sb.append(", newIndividualShare=").append(newIndividualShare);
+        sb.append(", newAttrSettingType=").append(newAttrSettingType);
+        sb.append(", shareCommissionBase=").append(shareCommissionBase);
+        sb.append(", isSjht=").append(isSjht);
+        sb.append(", sjhtProident=").append(sjhtProident);
+        sb.append(", isOil=").append(isOil);
+        sb.append(", oilCoutypecode=").append(oilCoutypecode);
+        sb.append(", isAbholung=").append(isAbholung);
+        sb.append(", isTransnational=").append(isTransnational);
+        sb.append(", goodsTransferRate=").append(goodsTransferRate);
+        sb.append(", oilDiscount=").append(oilDiscount);
+        sb.append(", oilType=").append(oilType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/entity/CyymallGoodsWithBLOBs.java

@@ -0,0 +1,256 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+
+/**
+ * cyymall_goods
+ * @author 
+ */
+public class CyymallGoodsWithBLOBs extends CyymallGoods implements Serializable {
+    private String detail;
+
+    private String attr;
+
+    private String coverPic;
+
+    private String fullCut;
+
+    private String integral;
+
+    private String shopId;
+
+    private String verifyCardId;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getAttr() {
+        return attr;
+    }
+
+    public void setAttr(String attr) {
+        this.attr = attr;
+    }
+
+    public String getCoverPic() {
+        return coverPic;
+    }
+
+    public void setCoverPic(String coverPic) {
+        this.coverPic = coverPic;
+    }
+
+    public String getFullCut() {
+        return fullCut;
+    }
+
+    public void setFullCut(String fullCut) {
+        this.fullCut = fullCut;
+    }
+
+    public String getIntegral() {
+        return integral;
+    }
+
+    public void setIntegral(String integral) {
+        this.integral = integral;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getVerifyCardId() {
+        return verifyCardId;
+    }
+
+    public void setVerifyCardId(String verifyCardId) {
+        this.verifyCardId = verifyCardId;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        CyymallGoodsWithBLOBs other = (CyymallGoodsWithBLOBs) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
+            && (this.getOriginalPrice() == null ? other.getOriginalPrice() == null : this.getOriginalPrice().equals(other.getOriginalPrice()))
+            && (this.getCatId() == null ? other.getCatId() == null : this.getCatId().equals(other.getCatId()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getAddtime() == null ? other.getAddtime() == null : this.getAddtime().equals(other.getAddtime()))
+            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+            && (this.getService() == null ? other.getService() == null : this.getService().equals(other.getService()))
+            && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort()))
+            && (this.getVirtualSales() == null ? other.getVirtualSales() == null : this.getVirtualSales().equals(other.getVirtualSales()))
+            && (this.getVideoUrl() == null ? other.getVideoUrl() == null : this.getVideoUrl().equals(other.getVideoUrl()))
+            && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit()))
+            && (this.getIndividualShare() == null ? other.getIndividualShare() == null : this.getIndividualShare().equals(other.getIndividualShare()))
+            && (this.getShareCommissionFirst() == null ? other.getShareCommissionFirst() == null : this.getShareCommissionFirst().equals(other.getShareCommissionFirst()))
+            && (this.getShareCommissionSecond() == null ? other.getShareCommissionSecond() == null : this.getShareCommissionSecond().equals(other.getShareCommissionSecond()))
+            && (this.getShareCommissionThird() == null ? other.getShareCommissionThird() == null : this.getShareCommissionThird().equals(other.getShareCommissionThird()))
+            && (this.getWeight() == null ? other.getWeight() == null : this.getWeight().equals(other.getWeight()))
+            && (this.getFreight() == null ? other.getFreight() == null : this.getFreight().equals(other.getFreight()))
+            && (this.getUseAttr() == null ? other.getUseAttr() == null : this.getUseAttr().equals(other.getUseAttr()))
+            && (this.getShareType() == null ? other.getShareType() == null : this.getShareType().equals(other.getShareType()))
+            && (this.getQuickPurchase() == null ? other.getQuickPurchase() == null : this.getQuickPurchase().equals(other.getQuickPurchase()))
+            && (this.getHotCakes() == null ? other.getHotCakes() == null : this.getHotCakes().equals(other.getHotCakes()))
+            && (this.getCostPrice() == null ? other.getCostPrice() == null : this.getCostPrice().equals(other.getCostPrice()))
+            && (this.getMemberDiscount() == null ? other.getMemberDiscount() == null : this.getMemberDiscount().equals(other.getMemberDiscount()))
+            && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
+            && (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId()))
+            && (this.getGoodsNum() == null ? other.getGoodsNum() == null : this.getGoodsNum().equals(other.getGoodsNum()))
+            && (this.getMchSort() == null ? other.getMchSort() == null : this.getMchSort().equals(other.getMchSort()))
+            && (this.getConfineCount() == null ? other.getConfineCount() == null : this.getConfineCount().equals(other.getConfineCount()))
+            && (this.getIsLevel() == null ? other.getIsLevel() == null : this.getIsLevel().equals(other.getIsLevel()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getIsNegotiable() == null ? other.getIsNegotiable() == null : this.getIsNegotiable().equals(other.getIsNegotiable()))
+            && (this.getAttrSettingType() == null ? other.getAttrSettingType() == null : this.getAttrSettingType().equals(other.getAttrSettingType()))
+            && (this.getViews() == null ? other.getViews() == null : this.getViews().equals(other.getViews()))
+            && (this.getSupplierPrice() == null ? other.getSupplierPrice() == null : this.getSupplierPrice().equals(other.getSupplierPrice()))
+            && (this.getSupplierGoodsId() == null ? other.getSupplierGoodsId() == null : this.getSupplierGoodsId().equals(other.getSupplierGoodsId()))
+            && (this.getSupplierId() == null ? other.getSupplierId() == null : this.getSupplierId().equals(other.getSupplierId()))
+            && (this.getGoodsShareTitle() == null ? other.getGoodsShareTitle() == null : this.getGoodsShareTitle().equals(other.getGoodsShareTitle()))
+            && (this.getGoodsShareLogo() == null ? other.getGoodsShareLogo() == null : this.getGoodsShareLogo().equals(other.getGoodsShareLogo()))
+            && (this.getGoodsShareDesc() == null ? other.getGoodsShareDesc() == null : this.getGoodsShareDesc().equals(other.getGoodsShareDesc()))
+            && (this.getIsExamine() == null ? other.getIsExamine() == null : this.getIsExamine().equals(other.getIsExamine()))
+            && (this.getDabaoPrice() == null ? other.getDabaoPrice() == null : this.getDabaoPrice().equals(other.getDabaoPrice()))
+            && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId()))
+            && (this.getKeyWord() == null ? other.getKeyWord() == null : this.getKeyWord().equals(other.getKeyWord()))
+            && (this.getBuyingMethod() == null ? other.getBuyingMethod() == null : this.getBuyingMethod().equals(other.getBuyingMethod()))
+            && (this.getBuyingMethodLevel() == null ? other.getBuyingMethodLevel() == null : this.getBuyingMethodLevel().equals(other.getBuyingMethodLevel()))
+            && (this.getHomeBlockId() == null ? other.getHomeBlockId() == null : this.getHomeBlockId().equals(other.getHomeBlockId()))
+            && (this.getNewIndividualShare() == null ? other.getNewIndividualShare() == null : this.getNewIndividualShare().equals(other.getNewIndividualShare()))
+            && (this.getNewAttrSettingType() == null ? other.getNewAttrSettingType() == null : this.getNewAttrSettingType().equals(other.getNewAttrSettingType()))
+            && (this.getShareCommissionBase() == null ? other.getShareCommissionBase() == null : this.getShareCommissionBase().equals(other.getShareCommissionBase()))
+            && (this.getIsSjht() == null ? other.getIsSjht() == null : this.getIsSjht().equals(other.getIsSjht()))
+            && (this.getSjhtProident() == null ? other.getSjhtProident() == null : this.getSjhtProident().equals(other.getSjhtProident()))
+            && (this.getIsOil() == null ? other.getIsOil() == null : this.getIsOil().equals(other.getIsOil()))
+            && (this.getOilCoutypecode() == null ? other.getOilCoutypecode() == null : this.getOilCoutypecode().equals(other.getOilCoutypecode()))
+            && (this.getIsAbholung() == null ? other.getIsAbholung() == null : this.getIsAbholung().equals(other.getIsAbholung()))
+            && (this.getIsTransnational() == null ? other.getIsTransnational() == null : this.getIsTransnational().equals(other.getIsTransnational()))
+            && (this.getGoodsTransferRate() == null ? other.getGoodsTransferRate() == null : this.getGoodsTransferRate().equals(other.getGoodsTransferRate()))
+            && (this.getOilDiscount() == null ? other.getOilDiscount() == null : this.getOilDiscount().equals(other.getOilDiscount()))
+            && (this.getOilType() == null ? other.getOilType() == null : this.getOilType().equals(other.getOilType()))
+            && (this.getDetail() == null ? other.getDetail() == null : this.getDetail().equals(other.getDetail()))
+            && (this.getAttr() == null ? other.getAttr() == null : this.getAttr().equals(other.getAttr()))
+            && (this.getCoverPic() == null ? other.getCoverPic() == null : this.getCoverPic().equals(other.getCoverPic()))
+            && (this.getFullCut() == null ? other.getFullCut() == null : this.getFullCut().equals(other.getFullCut()))
+            && (this.getIntegral() == null ? other.getIntegral() == null : this.getIntegral().equals(other.getIntegral()))
+            && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId()))
+            && (this.getVerifyCardId() == null ? other.getVerifyCardId() == null : this.getVerifyCardId().equals(other.getVerifyCardId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
+        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
+        result = prime * result + ((getOriginalPrice() == null) ? 0 : getOriginalPrice().hashCode());
+        result = prime * result + ((getCatId() == null) ? 0 : getCatId().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getAddtime() == null) ? 0 : getAddtime().hashCode());
+        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+        result = prime * result + ((getService() == null) ? 0 : getService().hashCode());
+        result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode());
+        result = prime * result + ((getVirtualSales() == null) ? 0 : getVirtualSales().hashCode());
+        result = prime * result + ((getVideoUrl() == null) ? 0 : getVideoUrl().hashCode());
+        result = prime * result + ((getUnit() == null) ? 0 : getUnit().hashCode());
+        result = prime * result + ((getIndividualShare() == null) ? 0 : getIndividualShare().hashCode());
+        result = prime * result + ((getShareCommissionFirst() == null) ? 0 : getShareCommissionFirst().hashCode());
+        result = prime * result + ((getShareCommissionSecond() == null) ? 0 : getShareCommissionSecond().hashCode());
+        result = prime * result + ((getShareCommissionThird() == null) ? 0 : getShareCommissionThird().hashCode());
+        result = prime * result + ((getWeight() == null) ? 0 : getWeight().hashCode());
+        result = prime * result + ((getFreight() == null) ? 0 : getFreight().hashCode());
+        result = prime * result + ((getUseAttr() == null) ? 0 : getUseAttr().hashCode());
+        result = prime * result + ((getShareType() == null) ? 0 : getShareType().hashCode());
+        result = prime * result + ((getQuickPurchase() == null) ? 0 : getQuickPurchase().hashCode());
+        result = prime * result + ((getHotCakes() == null) ? 0 : getHotCakes().hashCode());
+        result = prime * result + ((getCostPrice() == null) ? 0 : getCostPrice().hashCode());
+        result = prime * result + ((getMemberDiscount() == null) ? 0 : getMemberDiscount().hashCode());
+        result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
+        result = prime * result + ((getMchId() == null) ? 0 : getMchId().hashCode());
+        result = prime * result + ((getGoodsNum() == null) ? 0 : getGoodsNum().hashCode());
+        result = prime * result + ((getMchSort() == null) ? 0 : getMchSort().hashCode());
+        result = prime * result + ((getConfineCount() == null) ? 0 : getConfineCount().hashCode());
+        result = prime * result + ((getIsLevel() == null) ? 0 : getIsLevel().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getIsNegotiable() == null) ? 0 : getIsNegotiable().hashCode());
+        result = prime * result + ((getAttrSettingType() == null) ? 0 : getAttrSettingType().hashCode());
+        result = prime * result + ((getViews() == null) ? 0 : getViews().hashCode());
+        result = prime * result + ((getSupplierPrice() == null) ? 0 : getSupplierPrice().hashCode());
+        result = prime * result + ((getSupplierGoodsId() == null) ? 0 : getSupplierGoodsId().hashCode());
+        result = prime * result + ((getSupplierId() == null) ? 0 : getSupplierId().hashCode());
+        result = prime * result + ((getGoodsShareTitle() == null) ? 0 : getGoodsShareTitle().hashCode());
+        result = prime * result + ((getGoodsShareLogo() == null) ? 0 : getGoodsShareLogo().hashCode());
+        result = prime * result + ((getGoodsShareDesc() == null) ? 0 : getGoodsShareDesc().hashCode());
+        result = prime * result + ((getIsExamine() == null) ? 0 : getIsExamine().hashCode());
+        result = prime * result + ((getDabaoPrice() == null) ? 0 : getDabaoPrice().hashCode());
+        result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode());
+        result = prime * result + ((getKeyWord() == null) ? 0 : getKeyWord().hashCode());
+        result = prime * result + ((getBuyingMethod() == null) ? 0 : getBuyingMethod().hashCode());
+        result = prime * result + ((getBuyingMethodLevel() == null) ? 0 : getBuyingMethodLevel().hashCode());
+        result = prime * result + ((getHomeBlockId() == null) ? 0 : getHomeBlockId().hashCode());
+        result = prime * result + ((getNewIndividualShare() == null) ? 0 : getNewIndividualShare().hashCode());
+        result = prime * result + ((getNewAttrSettingType() == null) ? 0 : getNewAttrSettingType().hashCode());
+        result = prime * result + ((getShareCommissionBase() == null) ? 0 : getShareCommissionBase().hashCode());
+        result = prime * result + ((getIsSjht() == null) ? 0 : getIsSjht().hashCode());
+        result = prime * result + ((getSjhtProident() == null) ? 0 : getSjhtProident().hashCode());
+        result = prime * result + ((getIsOil() == null) ? 0 : getIsOil().hashCode());
+        result = prime * result + ((getOilCoutypecode() == null) ? 0 : getOilCoutypecode().hashCode());
+        result = prime * result + ((getIsAbholung() == null) ? 0 : getIsAbholung().hashCode());
+        result = prime * result + ((getIsTransnational() == null) ? 0 : getIsTransnational().hashCode());
+        result = prime * result + ((getGoodsTransferRate() == null) ? 0 : getGoodsTransferRate().hashCode());
+        result = prime * result + ((getOilDiscount() == null) ? 0 : getOilDiscount().hashCode());
+        result = prime * result + ((getOilType() == null) ? 0 : getOilType().hashCode());
+        result = prime * result + ((getDetail() == null) ? 0 : getDetail().hashCode());
+        result = prime * result + ((getAttr() == null) ? 0 : getAttr().hashCode());
+        result = prime * result + ((getCoverPic() == null) ? 0 : getCoverPic().hashCode());
+        result = prime * result + ((getFullCut() == null) ? 0 : getFullCut().hashCode());
+        result = prime * result + ((getIntegral() == null) ? 0 : getIntegral().hashCode());
+        result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode());
+        result = prime * result + ((getVerifyCardId() == null) ? 0 : getVerifyCardId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", detail=").append(detail);
+        sb.append(", attr=").append(attr);
+        sb.append(", coverPic=").append(coverPic);
+        sb.append(", fullCut=").append(fullCut);
+        sb.append(", integral=").append(integral);
+        sb.append(", shopId=").append(shopId);
+        sb.append(", verifyCardId=").append(verifyCardId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/entity/CyymallOrder.java

@@ -17,412 +17,172 @@ public class CyymallOrder implements Serializable {
 
     private Integer storeId;
 
-    /**
-     * 用户id
-     */
     private Integer userId;
 
-    /**
-     * 订单号
-     */
     private String orderNo;
 
-    /**
-     * 订单总费用(包含运费）
-     */
     private BigDecimal totalPrice;
 
-    /**
-     * 实际支付总费用(含运费）
-     */
     private BigDecimal payPrice;
 
-    /**
-     * 运费
-     */
     private BigDecimal expressPrice;
 
-    /**
-     * 收货人姓名
-     */
     private String name;
 
-    /**
-     * 收货人手机
-     */
     private String mobile;
 
-    /**
-     * 收货地址
-     */
     private String address;
 
-    /**
-     * 订单备注
-     */
     private String remark;
 
-    /**
-     * 支付状态：0=未支付，1=已支付
-     */
     private Short isPay;
 
-    /**
-     * 支付方式：1=微信支付
-     */
     private Short payType;
 
-    /**
-     * 支付时间
-     */
     private Integer payTime;
 
-    /**
-     * 发货状态：0=未发货，1=已发货
-     */
     private Short isSend;
 
-    /**
-     * 发货时间
-     */
     private Integer sendTime;
 
-    /**
-     * 物流公司
-     */
     private String express;
 
     private String expressNo;
 
-    /**
-     * 确认收货状态：0=未确认，1=已确认收货
-     */
     private Short isConfirm;
 
-    /**
-     * 确认收货时间
-     */
     private Integer confirmTime;
 
-    /**
-     * 是否已评价：0=未评价，1=已评价
-     */
     private Short isComment;
 
-    /**
-     * 是否申请取消订单：0=否，1=申请取消订单
-     */
     private Short applyDelete;
 
     private Integer addtime;
 
     private Short isDelete;
 
-    /**
-     * 是否发放佣金
-     */
     private Short isPrice;
 
-    /**
-     * 用户上级ID
-     */
     private Integer parentId;
 
-    /**
-     * 一级佣金
-     */
     private BigDecimal firstPrice;
 
-    /**
-     * 二级佣金
-     */
     private BigDecimal secondPrice;
 
-    /**
-     * 三级佣金
-     */
     private BigDecimal thirdPrice;
 
-    /**
-     * 优惠券抵消金额
-     */
     private BigDecimal couponSubPrice;
 
-    /**
-     * 是否到店自提 0--否 1--是
-     */
     private Integer isOffline;
 
-    /**
-     * 核销员user_id
-     */
     private Integer clerkId;
 
-    /**
-     * 是否取消
-     */
     private Short isCancel;
 
-    /**
-     * 修改前的价格
-     */
     private BigDecimal beforeUpdatePrice;
 
-    /**
-     * 自提门店ID
-     */
     private Integer shopId;
 
-    /**
-     * 会员折扣
-     */
     private BigDecimal discount;
 
-    /**
-     * 使用的优惠券ID
-     */
     private Integer userCouponId;
 
-    /**
-     * 是否发放积分【1=> 已发放 ， 0=> 未发放】
-     */
     private Short giveIntegral;
 
-    /**
-     * 用户上二级ID
-     */
-    private Integer parentId1;
-
-    /**
-     * 用户上三级ID
-     */
     private Integer parentId2;
 
-    /**
-     * 是否超过售后时间
-     */
+    private Integer parentId3;
+
     private Integer isSale;
 
-    /**
-     * 版本
-     */
     private String version;
 
-    /**
-     * 减免的运费
-     */
-    private BigDecimal expressPrice1;
+    private BigDecimal expressPrice2;
 
     private Short isRecycle;
 
-    /**
-     * 自购返利
-     */
     private BigDecimal rebate;
 
-    /**
-     * 价格修改前的运费
-     */
     private BigDecimal beforeUpdateExpress;
 
-    /**
-     * 入驻商户id
-     */
     private Integer mchId;
 
-    /**
-     * 合并订单的id
-     */
     private Integer orderUnionId;
 
-    /**
-     * 是否已转入商户账户：0=否，1=是
-     */
     private Short isTransfer;
 
-    /**
-     * 0:普通订单 1大转盘订单
-     */
     private Integer type;
 
-    /**
-     * 发放佣金的金额
-     */
     private BigDecimal sharePrice;
 
-    /**
-     * 是否显示 0--不显示 1--显示
-     */
     private Short isShow;
 
-    /**
-     * 货币：活力币
-     */
     private BigDecimal currency;
 
-    /**
-     * 订单来源：1、公众号或网站，2、app，3、小程序
-     */
     private Boolean orderOrigin;
 
-    /**
-     * 配送员id
-     */
     private Integer deliveryId;
 
-    /**
-     * 配送状态1已分配配送员2配送中3已配送
-     */
     private Boolean deliveryStatus;
 
-    /**
-     * 返佣状态0未开始1进行中2已完成
-     */
     private Boolean fyStatus;
 
-    /**
-     * 返佣金额
-     */
     private BigDecimal fyjine;
 
-    /**
-     * 每日返还
-     */
     private BigDecimal fysingle;
 
-    /**
-     * 商家返佣金额
-     */
     private BigDecimal mchFyjine;
 
-    /**
-     * 商家每日返佣
-     */
     private BigDecimal mchFysingle;
 
-    /**
-     * 0未1已
-     */
     private Boolean isFan;
 
-    /**
-     * 0否1是
-     */
     private Boolean isDada;
 
-    /**
-     * 是否已生成团长配送单
-     */
     private Integer shopPeisong;
 
-    /**
-     * 是否是线下购物车下的订单
-     */
     private Boolean isOpenOffline;
 
-    /**
-     * 供货商id
-     */
     private Integer supplierId;
 
-    /**
-     * 是否已转入商户账户：0=否，1=是
-     */
     private Boolean isSupTransfer;
 
-    /**
-     * 商品打包费
-     */
     private BigDecimal dabaoPrice;
 
-    /**
-     * 结算金额
-     */
     private BigDecimal settlementAmount;
 
-    /**
-     * 是否结算0-未结算 1- 已结算
-     */
     private Short isSettlement;
 
-    /**
-     * 结算时间
-     */
     private Integer settlementTime;
 
-    /**
-     * 是否是入驻商门店, 配合shop_id来判断
-     */
     private Boolean isMchShop;
 
-    /**
-     * 是否分账
-     */
     private Boolean isDivideMoney;
 
-    /**
-     * 微信回调交易单号
-     */
     private String transactionId;
 
-    /**
-     * 实际支付用户id
-     */
     private Integer payUserId;
 
-    /**
-     * 实际支付方式  1=微信支付 2=货到付款 3=余额支付 5=连连支付
-     */
     private Boolean payTypeTrue;
 
-    /**
-     * 是否是抖品订单：0=否，1=是
-     */
     private Integer isVgoods;
 
-    /**
-     * 首单减免金额
-     */
     private BigDecimal reductionPrice;
 
-    /**
-     * 满减优惠
-     */
     private BigDecimal minusPrice;
 
-    /**
-     * 订单来源
-     */
     private Integer orderFrom;
 
-    /**
-     * 新满减活动金额
-     */
     private BigDecimal discountPrice;
 
-    /**
-     * 满折
-     */
     private BigDecimal discountNum;
 
-    /**
-     * 满赠商品ID
-     */
     private Integer giveGoodsId;
 
-    /**
-     * 世纪恒通券码
-     */
     private String couponRecordId;
 
-    /**
-     * 身份证证件号
-     */
     private String idCardNo;
 
-    /**
-     * 退款时间
-     */
     private Integer refundTime;
 
     private static final long serialVersionUID = 1L;
@@ -731,14 +491,6 @@ public class CyymallOrder implements Serializable {
         this.giveIntegral = giveIntegral;
     }
 
-    public Integer getParentId1() {
-        return parentId1;
-    }
-
-    public void setParentId1(Integer parentId1) {
-        this.parentId1 = parentId1;
-    }
-
     public Integer getParentId2() {
         return parentId2;
     }
@@ -747,6 +499,14 @@ public class CyymallOrder implements Serializable {
         this.parentId2 = parentId2;
     }
 
+    public Integer getParentId3() {
+        return parentId3;
+    }
+
+    public void setParentId3(Integer parentId3) {
+        this.parentId3 = parentId3;
+    }
+
     public Integer getIsSale() {
         return isSale;
     }
@@ -763,12 +523,12 @@ public class CyymallOrder implements Serializable {
         this.version = version;
     }
 
-    public BigDecimal getExpressPrice1() {
-        return expressPrice1;
+    public BigDecimal getExpressPrice2() {
+        return expressPrice2;
     }
 
-    public void setExpressPrice1(BigDecimal expressPrice1) {
-        this.expressPrice1 = expressPrice1;
+    public void setExpressPrice2(BigDecimal expressPrice2) {
+        this.expressPrice2 = expressPrice2;
     }
 
     public Short getIsRecycle() {
@@ -1165,11 +925,11 @@ public class CyymallOrder implements Serializable {
             && (this.getDiscount() == null ? other.getDiscount() == null : this.getDiscount().equals(other.getDiscount()))
             && (this.getUserCouponId() == null ? other.getUserCouponId() == null : this.getUserCouponId().equals(other.getUserCouponId()))
             && (this.getGiveIntegral() == null ? other.getGiveIntegral() == null : this.getGiveIntegral().equals(other.getGiveIntegral()))
-            && (this.getParentId1() == null ? other.getParentId1() == null : this.getParentId1().equals(other.getParentId1()))
             && (this.getParentId2() == null ? other.getParentId2() == null : this.getParentId2().equals(other.getParentId2()))
+            && (this.getParentId3() == null ? other.getParentId3() == null : this.getParentId3().equals(other.getParentId3()))
             && (this.getIsSale() == null ? other.getIsSale() == null : this.getIsSale().equals(other.getIsSale()))
             && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion()))
-            && (this.getExpressPrice1() == null ? other.getExpressPrice1() == null : this.getExpressPrice1().equals(other.getExpressPrice1()))
+            && (this.getExpressPrice2() == null ? other.getExpressPrice2() == null : this.getExpressPrice2().equals(other.getExpressPrice2()))
             && (this.getIsRecycle() == null ? other.getIsRecycle() == null : this.getIsRecycle().equals(other.getIsRecycle()))
             && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
             && (this.getBeforeUpdateExpress() == null ? other.getBeforeUpdateExpress() == null : this.getBeforeUpdateExpress().equals(other.getBeforeUpdateExpress()))
@@ -1257,11 +1017,11 @@ public class CyymallOrder implements Serializable {
         result = prime * result + ((getDiscount() == null) ? 0 : getDiscount().hashCode());
         result = prime * result + ((getUserCouponId() == null) ? 0 : getUserCouponId().hashCode());
         result = prime * result + ((getGiveIntegral() == null) ? 0 : getGiveIntegral().hashCode());
-        result = prime * result + ((getParentId1() == null) ? 0 : getParentId1().hashCode());
         result = prime * result + ((getParentId2() == null) ? 0 : getParentId2().hashCode());
+        result = prime * result + ((getParentId3() == null) ? 0 : getParentId3().hashCode());
         result = prime * result + ((getIsSale() == null) ? 0 : getIsSale().hashCode());
         result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode());
-        result = prime * result + ((getExpressPrice1() == null) ? 0 : getExpressPrice1().hashCode());
+        result = prime * result + ((getExpressPrice2() == null) ? 0 : getExpressPrice2().hashCode());
         result = prime * result + ((getIsRecycle() == null) ? 0 : getIsRecycle().hashCode());
         result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
         result = prime * result + ((getBeforeUpdateExpress() == null) ? 0 : getBeforeUpdateExpress().hashCode());
@@ -1352,11 +1112,11 @@ public class CyymallOrder implements Serializable {
         sb.append(", discount=").append(discount);
         sb.append(", userCouponId=").append(userCouponId);
         sb.append(", giveIntegral=").append(giveIntegral);
-        sb.append(", parentId1=").append(parentId1);
         sb.append(", parentId2=").append(parentId2);
+        sb.append(", parentId3=").append(parentId3);
         sb.append(", isSale=").append(isSale);
         sb.append(", version=").append(version);
-        sb.append(", expressPrice1=").append(expressPrice1);
+        sb.append(", expressPrice2=").append(expressPrice2);
         sb.append(", isRecycle=").append(isRecycle);
         sb.append(", rebate=").append(rebate);
         sb.append(", beforeUpdateExpress=").append(beforeUpdateExpress);

service/src/main/java/com/hfkj/entity/CyymallOrderDetail.java

@@ -0,0 +1,270 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * cyymall_order_detail
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class CyymallOrderDetail implements Serializable {
+    private Integer id;
+
+    private Integer orderId;
+
+    private Integer goodsId;
+
+    private Integer num;
+
+    private BigDecimal totalPrice;
+
+    private Integer addtime;
+
+    private Short isDelete;
+
+    private String pic;
+
+    private Integer integral;
+
+    private Short isLevel;
+
+    private String batchPriceTips;
+
+    private BigDecimal supplierPrice;
+
+    private Integer vgoodsId;
+
+    private BigDecimal vgoodsPrice;
+
+    private Integer verifyCardSaleId;
+
+    private Integer giveGoodsId;
+
+    private String attr;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Integer goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public Integer getAddtime() {
+        return addtime;
+    }
+
+    public void setAddtime(Integer addtime) {
+        this.addtime = addtime;
+    }
+
+    public Short getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public Integer getIntegral() {
+        return integral;
+    }
+
+    public void setIntegral(Integer integral) {
+        this.integral = integral;
+    }
+
+    public Short getIsLevel() {
+        return isLevel;
+    }
+
+    public void setIsLevel(Short isLevel) {
+        this.isLevel = isLevel;
+    }
+
+    public String getBatchPriceTips() {
+        return batchPriceTips;
+    }
+
+    public void setBatchPriceTips(String batchPriceTips) {
+        this.batchPriceTips = batchPriceTips;
+    }
+
+    public BigDecimal getSupplierPrice() {
+        return supplierPrice;
+    }
+
+    public void setSupplierPrice(BigDecimal supplierPrice) {
+        this.supplierPrice = supplierPrice;
+    }
+
+    public Integer getVgoodsId() {
+        return vgoodsId;
+    }
+
+    public void setVgoodsId(Integer vgoodsId) {
+        this.vgoodsId = vgoodsId;
+    }
+
+    public BigDecimal getVgoodsPrice() {
+        return vgoodsPrice;
+    }
+
+    public void setVgoodsPrice(BigDecimal vgoodsPrice) {
+        this.vgoodsPrice = vgoodsPrice;
+    }
+
+    public Integer getVerifyCardSaleId() {
+        return verifyCardSaleId;
+    }
+
+    public void setVerifyCardSaleId(Integer verifyCardSaleId) {
+        this.verifyCardSaleId = verifyCardSaleId;
+    }
+
+    public Integer getGiveGoodsId() {
+        return giveGoodsId;
+    }
+
+    public void setGiveGoodsId(Integer giveGoodsId) {
+        this.giveGoodsId = giveGoodsId;
+    }
+
+    public String getAttr() {
+        return attr;
+    }
+
+    public void setAttr(String attr) {
+        this.attr = attr;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        CyymallOrderDetail other = (CyymallOrderDetail) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
+            && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
+            && (this.getNum() == null ? other.getNum() == null : this.getNum().equals(other.getNum()))
+            && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
+            && (this.getAddtime() == null ? other.getAddtime() == null : this.getAddtime().equals(other.getAddtime()))
+            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+            && (this.getPic() == null ? other.getPic() == null : this.getPic().equals(other.getPic()))
+            && (this.getIntegral() == null ? other.getIntegral() == null : this.getIntegral().equals(other.getIntegral()))
+            && (this.getIsLevel() == null ? other.getIsLevel() == null : this.getIsLevel().equals(other.getIsLevel()))
+            && (this.getBatchPriceTips() == null ? other.getBatchPriceTips() == null : this.getBatchPriceTips().equals(other.getBatchPriceTips()))
+            && (this.getSupplierPrice() == null ? other.getSupplierPrice() == null : this.getSupplierPrice().equals(other.getSupplierPrice()))
+            && (this.getVgoodsId() == null ? other.getVgoodsId() == null : this.getVgoodsId().equals(other.getVgoodsId()))
+            && (this.getVgoodsPrice() == null ? other.getVgoodsPrice() == null : this.getVgoodsPrice().equals(other.getVgoodsPrice()))
+            && (this.getVerifyCardSaleId() == null ? other.getVerifyCardSaleId() == null : this.getVerifyCardSaleId().equals(other.getVerifyCardSaleId()))
+            && (this.getGiveGoodsId() == null ? other.getGiveGoodsId() == null : this.getGiveGoodsId().equals(other.getGiveGoodsId()))
+            && (this.getAttr() == null ? other.getAttr() == null : this.getAttr().equals(other.getAttr()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
+        result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
+        result = prime * result + ((getNum() == null) ? 0 : getNum().hashCode());
+        result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
+        result = prime * result + ((getAddtime() == null) ? 0 : getAddtime().hashCode());
+        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+        result = prime * result + ((getPic() == null) ? 0 : getPic().hashCode());
+        result = prime * result + ((getIntegral() == null) ? 0 : getIntegral().hashCode());
+        result = prime * result + ((getIsLevel() == null) ? 0 : getIsLevel().hashCode());
+        result = prime * result + ((getBatchPriceTips() == null) ? 0 : getBatchPriceTips().hashCode());
+        result = prime * result + ((getSupplierPrice() == null) ? 0 : getSupplierPrice().hashCode());
+        result = prime * result + ((getVgoodsId() == null) ? 0 : getVgoodsId().hashCode());
+        result = prime * result + ((getVgoodsPrice() == null) ? 0 : getVgoodsPrice().hashCode());
+        result = prime * result + ((getVerifyCardSaleId() == null) ? 0 : getVerifyCardSaleId().hashCode());
+        result = prime * result + ((getGiveGoodsId() == null) ? 0 : getGiveGoodsId().hashCode());
+        result = prime * result + ((getAttr() == null) ? 0 : getAttr().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orderId=").append(orderId);
+        sb.append(", goodsId=").append(goodsId);
+        sb.append(", num=").append(num);
+        sb.append(", totalPrice=").append(totalPrice);
+        sb.append(", addtime=").append(addtime);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", pic=").append(pic);
+        sb.append(", integral=").append(integral);
+        sb.append(", isLevel=").append(isLevel);
+        sb.append(", batchPriceTips=").append(batchPriceTips);
+        sb.append(", supplierPrice=").append(supplierPrice);
+        sb.append(", vgoodsId=").append(vgoodsId);
+        sb.append(", vgoodsPrice=").append(vgoodsPrice);
+        sb.append(", verifyCardSaleId=").append(verifyCardSaleId);
+        sb.append(", giveGoodsId=").append(giveGoodsId);
+        sb.append(", attr=").append(attr);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/entity/CyymallOrderExample.java

@@ -2475,123 +2475,123 @@ public class CyymallOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andParentId1IsNull() {
-            addCriterion("parent_id_1 is null");
+        public Criteria andParentId2IsNull() {
+            addCriterion("parent_id_2 is null");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1IsNotNull() {
-            addCriterion("parent_id_1 is not null");
+        public Criteria andParentId2IsNotNull() {
+            addCriterion("parent_id_2 is not null");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1EqualTo(Integer value) {
-            addCriterion("parent_id_1 =", value, "parentId1");
+        public Criteria andParentId2EqualTo(Integer value) {
+            addCriterion("parent_id_2 =", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1NotEqualTo(Integer value) {
-            addCriterion("parent_id_1 <>", value, "parentId1");
+        public Criteria andParentId2NotEqualTo(Integer value) {
+            addCriterion("parent_id_2 <>", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1GreaterThan(Integer value) {
-            addCriterion("parent_id_1 >", value, "parentId1");
+        public Criteria andParentId2GreaterThan(Integer value) {
+            addCriterion("parent_id_2 >", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1GreaterThanOrEqualTo(Integer value) {
-            addCriterion("parent_id_1 >=", value, "parentId1");
+        public Criteria andParentId2GreaterThanOrEqualTo(Integer value) {
+            addCriterion("parent_id_2 >=", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1LessThan(Integer value) {
-            addCriterion("parent_id_1 <", value, "parentId1");
+        public Criteria andParentId2LessThan(Integer value) {
+            addCriterion("parent_id_2 <", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1LessThanOrEqualTo(Integer value) {
-            addCriterion("parent_id_1 <=", value, "parentId1");
+        public Criteria andParentId2LessThanOrEqualTo(Integer value) {
+            addCriterion("parent_id_2 <=", value, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1In(List<Integer> values) {
-            addCriterion("parent_id_1 in", values, "parentId1");
+        public Criteria andParentId2In(List<Integer> values) {
+            addCriterion("parent_id_2 in", values, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1NotIn(List<Integer> values) {
-            addCriterion("parent_id_1 not in", values, "parentId1");
+        public Criteria andParentId2NotIn(List<Integer> values) {
+            addCriterion("parent_id_2 not in", values, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1Between(Integer value1, Integer value2) {
-            addCriterion("parent_id_1 between", value1, value2, "parentId1");
+        public Criteria andParentId2Between(Integer value1, Integer value2) {
+            addCriterion("parent_id_2 between", value1, value2, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId1NotBetween(Integer value1, Integer value2) {
-            addCriterion("parent_id_1 not between", value1, value2, "parentId1");
+        public Criteria andParentId2NotBetween(Integer value1, Integer value2) {
+            addCriterion("parent_id_2 not between", value1, value2, "parentId2");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2IsNull() {
-            addCriterion("parent_id_2 is null");
+        public Criteria andParentId3IsNull() {
+            addCriterion("parent_id_3 is null");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2IsNotNull() {
-            addCriterion("parent_id_2 is not null");
+        public Criteria andParentId3IsNotNull() {
+            addCriterion("parent_id_3 is not null");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2EqualTo(Integer value) {
-            addCriterion("parent_id_2 =", value, "parentId2");
+        public Criteria andParentId3EqualTo(Integer value) {
+            addCriterion("parent_id_3 =", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2NotEqualTo(Integer value) {
-            addCriterion("parent_id_2 <>", value, "parentId2");
+        public Criteria andParentId3NotEqualTo(Integer value) {
+            addCriterion("parent_id_3 <>", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2GreaterThan(Integer value) {
-            addCriterion("parent_id_2 >", value, "parentId2");
+        public Criteria andParentId3GreaterThan(Integer value) {
+            addCriterion("parent_id_3 >", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2GreaterThanOrEqualTo(Integer value) {
-            addCriterion("parent_id_2 >=", value, "parentId2");
+        public Criteria andParentId3GreaterThanOrEqualTo(Integer value) {
+            addCriterion("parent_id_3 >=", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2LessThan(Integer value) {
-            addCriterion("parent_id_2 <", value, "parentId2");
+        public Criteria andParentId3LessThan(Integer value) {
+            addCriterion("parent_id_3 <", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2LessThanOrEqualTo(Integer value) {
-            addCriterion("parent_id_2 <=", value, "parentId2");
+        public Criteria andParentId3LessThanOrEqualTo(Integer value) {
+            addCriterion("parent_id_3 <=", value, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2In(List<Integer> values) {
-            addCriterion("parent_id_2 in", values, "parentId2");
+        public Criteria andParentId3In(List<Integer> values) {
+            addCriterion("parent_id_3 in", values, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2NotIn(List<Integer> values) {
-            addCriterion("parent_id_2 not in", values, "parentId2");
+        public Criteria andParentId3NotIn(List<Integer> values) {
+            addCriterion("parent_id_3 not in", values, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2Between(Integer value1, Integer value2) {
-            addCriterion("parent_id_2 between", value1, value2, "parentId2");
+        public Criteria andParentId3Between(Integer value1, Integer value2) {
+            addCriterion("parent_id_3 between", value1, value2, "parentId3");
             return (Criteria) this;
         }
 
-        public Criteria andParentId2NotBetween(Integer value1, Integer value2) {
-            addCriterion("parent_id_2 not between", value1, value2, "parentId2");
+        public Criteria andParentId3NotBetween(Integer value1, Integer value2) {
+            addCriterion("parent_id_3 not between", value1, value2, "parentId3");
             return (Criteria) this;
         }
 
@@ -2725,63 +2725,63 @@ public class CyymallOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1IsNull() {
-            addCriterion("express_price_1 is null");
+        public Criteria andExpressPrice2IsNull() {
+            addCriterion("express_price_2 is null");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1IsNotNull() {
-            addCriterion("express_price_1 is not null");
+        public Criteria andExpressPrice2IsNotNull() {
+            addCriterion("express_price_2 is not null");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1EqualTo(BigDecimal value) {
-            addCriterion("express_price_1 =", value, "expressPrice1");
+        public Criteria andExpressPrice2EqualTo(BigDecimal value) {
+            addCriterion("express_price_2 =", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1NotEqualTo(BigDecimal value) {
-            addCriterion("express_price_1 <>", value, "expressPrice1");
+        public Criteria andExpressPrice2NotEqualTo(BigDecimal value) {
+            addCriterion("express_price_2 <>", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1GreaterThan(BigDecimal value) {
-            addCriterion("express_price_1 >", value, "expressPrice1");
+        public Criteria andExpressPrice2GreaterThan(BigDecimal value) {
+            addCriterion("express_price_2 >", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1GreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("express_price_1 >=", value, "expressPrice1");
+        public Criteria andExpressPrice2GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("express_price_2 >=", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1LessThan(BigDecimal value) {
-            addCriterion("express_price_1 <", value, "expressPrice1");
+        public Criteria andExpressPrice2LessThan(BigDecimal value) {
+            addCriterion("express_price_2 <", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1LessThanOrEqualTo(BigDecimal value) {
-            addCriterion("express_price_1 <=", value, "expressPrice1");
+        public Criteria andExpressPrice2LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("express_price_2 <=", value, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1In(List<BigDecimal> values) {
-            addCriterion("express_price_1 in", values, "expressPrice1");
+        public Criteria andExpressPrice2In(List<BigDecimal> values) {
+            addCriterion("express_price_2 in", values, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1NotIn(List<BigDecimal> values) {
-            addCriterion("express_price_1 not in", values, "expressPrice1");
+        public Criteria andExpressPrice2NotIn(List<BigDecimal> values) {
+            addCriterion("express_price_2 not in", values, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1Between(BigDecimal value1, BigDecimal value2) {
-            addCriterion("express_price_1 between", value1, value2, "expressPrice1");
+        public Criteria andExpressPrice2Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("express_price_2 between", value1, value2, "expressPrice2");
             return (Criteria) this;
         }
 
-        public Criteria andExpressPrice1NotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("express_price_1 not between", value1, value2, "expressPrice1");
+        public Criteria andExpressPrice2NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("express_price_2 not between", value1, value2, "expressPrice2");
             return (Criteria) this;
         }
 

service/src/main/java/com/hfkj/entity/CyymallOrderWithBLOBs.java

@@ -9,29 +9,14 @@ import java.io.Serializable;
 public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable {
     private String content;
 
-    /**
-     * 收货地址信息，json格式
-     */
     private String addressData;
 
-    /**
-     * 核销码
-     */
     private String offlineQrcode;
 
-    /**
-     * 积分使用
-     */
     private String integral;
 
-    /**
-     * 商家留言
-     */
     private String words;
 
-    /**
-     * 商家备注
-     */
     private String sellerComments;
 
     private static final long serialVersionUID = 1L;
@@ -134,11 +119,11 @@ public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable
             && (this.getDiscount() == null ? other.getDiscount() == null : this.getDiscount().equals(other.getDiscount()))
             && (this.getUserCouponId() == null ? other.getUserCouponId() == null : this.getUserCouponId().equals(other.getUserCouponId()))
             && (this.getGiveIntegral() == null ? other.getGiveIntegral() == null : this.getGiveIntegral().equals(other.getGiveIntegral()))
-            && (this.getParentId1() == null ? other.getParentId1() == null : this.getParentId1().equals(other.getParentId1()))
             && (this.getParentId2() == null ? other.getParentId2() == null : this.getParentId2().equals(other.getParentId2()))
+            && (this.getParentId3() == null ? other.getParentId3() == null : this.getParentId3().equals(other.getParentId3()))
             && (this.getIsSale() == null ? other.getIsSale() == null : this.getIsSale().equals(other.getIsSale()))
             && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion()))
-            && (this.getExpressPrice1() == null ? other.getExpressPrice1() == null : this.getExpressPrice1().equals(other.getExpressPrice1()))
+            && (this.getExpressPrice2() == null ? other.getExpressPrice2() == null : this.getExpressPrice2().equals(other.getExpressPrice2()))
             && (this.getIsRecycle() == null ? other.getIsRecycle() == null : this.getIsRecycle().equals(other.getIsRecycle()))
             && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
             && (this.getBeforeUpdateExpress() == null ? other.getBeforeUpdateExpress() == null : this.getBeforeUpdateExpress().equals(other.getBeforeUpdateExpress()))
@@ -232,11 +217,11 @@ public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable
         result = prime * result + ((getDiscount() == null) ? 0 : getDiscount().hashCode());
         result = prime * result + ((getUserCouponId() == null) ? 0 : getUserCouponId().hashCode());
         result = prime * result + ((getGiveIntegral() == null) ? 0 : getGiveIntegral().hashCode());
-        result = prime * result + ((getParentId1() == null) ? 0 : getParentId1().hashCode());
         result = prime * result + ((getParentId2() == null) ? 0 : getParentId2().hashCode());
+        result = prime * result + ((getParentId3() == null) ? 0 : getParentId3().hashCode());
         result = prime * result + ((getIsSale() == null) ? 0 : getIsSale().hashCode());
         result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode());
-        result = prime * result + ((getExpressPrice1() == null) ? 0 : getExpressPrice1().hashCode());
+        result = prime * result + ((getExpressPrice2() == null) ? 0 : getExpressPrice2().hashCode());
         result = prime * result + ((getIsRecycle() == null) ? 0 : getIsRecycle().hashCode());
         result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
         result = prime * result + ((getBeforeUpdateExpress() == null) ? 0 : getBeforeUpdateExpress().hashCode());

service/src/main/java/com/hfkj/entity/CyymallUser.java

@@ -15,9 +15,6 @@ import java.math.BigDecimal;
 public class CyymallUser implements Serializable {
     private Integer id;
 
-    /**
-     * 用户类型：0=管理员，1=普通用户
-     */
     private Short type;
 
     private String username;
@@ -32,118 +29,52 @@ public class CyymallUser implements Serializable {
 
     private Short isDelete;
 
-    /**
-     * 微信openid
-     */
     private String wechatOpenId;
 
-    /**
-     * 微信用户union id
-     */
     private String wechatUnionId;
 
-    /**
-     * 昵称
-     */
     private String nickname;
 
     private String avatarUrl;
 
-    /**
-     * 商城id
-     */
     private Integer storeId;
 
-    /**
-     * 是否是分销商 0--不是 1--是 2--申请中
-     */
     private Integer isDistributor;
 
-    /**
-     * 父级ID
-     */
     private Integer parentId;
 
-    /**
-     * 成为分销商的时间
-     */
     private Integer time;
 
-    /**
-     * 累计佣金
-     */
     private BigDecimal totalPrice;
 
-    /**
-     * 可提现佣金
-     */
     private BigDecimal price;
 
-    /**
-     * 是否是核销员 0--不是 1--是
-     */
     private Integer isClerk;
 
-    /**
-     * 微擎账户id
-     */
     private Integer we7Uid;
 
     private Integer shopId;
 
-    /**
-     * 会员等级
-     */
     private Integer level;
 
-    /**
-     * 用户当前积分
-     */
     private Integer integral;
 
-    /**
-     * 用户总获得积分
-     */
     private Integer totalIntegral;
 
-    /**
-     * 余额
-     */
     private BigDecimal money;
 
-    /**
-     * 联系方式
-     */
     private String contactWay;
 
-    /**
-     * 备注
-     */
     private String comments;
 
-    /**
-     * 授权手机号
-     */
     private String binding;
 
-    /**
-     * 微信公众号openid
-     */
     private String wechatPlatformOpenId;
 
-    /**
-     * 小程序平台 0 => 微信, 1 => 支付宝
-     */
     private Byte platform;
 
-    /**
-     * 黑名单 0.否 | 1.是
-     */
     private Boolean blacklist;
 
-    /**
-     * 可能成为上级的ID
-     */
     private Integer parentUserId;
 
     private String appcid;
@@ -152,108 +83,48 @@ public class CyymallUser implements Serializable {
 
     private BigDecimal tuanPrice;
 
-    /**
-     * 1是配送员0不是
-     */
     private Boolean isDelivery;
 
     private Integer mchId;
 
-    /**
-     * 真实姓名
-     */
     private String realName;
 
-    /**
-     * 身份证号
-     */
     private String realCode;
 
-    /**
-     * 身份证正面照
-     */
     private String realJustPic;
 
-    /**
-     * 身份证反面照
-     */
     private String realBackPic;
 
-    /**
-     * 是否已实名注册 2审核中3审核未通过1审核通过
-     */
     private Boolean isReal;
 
-    /**
-     * 直播佣金
-     */
     private BigDecimal livePrice;
 
-    /**
-     * 待返总金额
-     */
     private String fyjine;
 
-    /**
-     * 已返金额
-     */
     private String yifan;
 
-    /**
-     * 骑手是否在线（0、在线，1离线）
-     */
     private Boolean deliveryOffice;
 
-    /**
-     * 补贴金额
-     */
     private BigDecimal subsidyPrice;
 
     private Integer deliveryMchId;
 
-    /**
-     * 核销员入驻商id
-     */
     private Integer clerkMchId;
 
-    /**
-     * 是否团长身份 0--否，1--是
-     */
     private Integer isGroupCentre;
 
-    /**
-     * 性别0-未知,1男,2女
-     */
     private Integer sex;
 
-    /**
-     * 出生日期
-     */
     private String birthDate;
 
-    /**
-     * 是否允许发布抖品：0=否，1=是
-     */
     private Integer isVgoods;
 
-    /**
-     * 分销商分组id
-     */
     private Integer shareCatId;
 
-    /**
-     * 用户标签
-     */
     private Integer userLabel;
 
-    /**
-     * 工会卡号
-     */
     private String ghCardNo;
 
-    /**
-     * 工会卡消费密码
-     */
     private Integer ghCardPwd;
 
     private String channelPhone;
@@ -264,9 +135,6 @@ public class CyymallUser implements Serializable {
 
     private Integer applyTime;
 
-    /**
-     * 1申请中也就是待处理，2已处理，其他就是不申请了
-     */
     private Short applyStatus;
 
     private static final long serialVersionUID = 1L;