废弃代码删除

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -201,8 +201,6 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     List<OrderReceiptRelationPo> getUndividedPaidReceipt(@Param("currentTime")String currentTime,@Param("shopOrderIds")String shopOrderIds);
 
-    List<OrderReceiptRelationPo> getOnlineBalance(String currentTime);
-
     List<OrderProductVo> getOrderProductByOrderId(Integer orderId);
 
     Double getOrderProductPaidAmount(Integer orderProductId);

src/main/java/com/caimei/modules/product/entity/CmShoporder.java

@@ -56,7 +56,6 @@ public class CmShoporder extends DataEntity<CmShoporder> {
 	private String returnGoodsStatus;		// returnGoodsStatus
 	private String deliveryTime;		// 发货时间
 	private String receiveGoodsTime;		// 收货时间
-	private String synToERPFlag;		// 是否推送到ERP：1是，空或0否
 	private Long deliveryTimeMills;		// 发货时间（时间戳）
 	private Long autoReviceGoodsDeadTimeMills;		// 订单由发货状态自动变更为已签收状态的时间（当前默认15天）
 	private Long autoFinishDeadTimeMills;		// 订单由已签收状态自动变更为已完成状态的时间（当前默认15天）
@@ -489,16 +488,7 @@ public class CmShoporder extends DataEntity<CmShoporder> {
 	public void setReceiveGoodsTime(String receiveGoodsTime) {
 		this.receiveGoodsTime = receiveGoodsTime;
 	}
-	
-	@Length(min=0, max=1, message="是否推送到ERP：1是，空或0否长度必须介于 0 和 1 之间")
-	public String getSynToERPFlag() {
-		return synToERPFlag;
-	}
 
-	public void setSynToERPFlag(String synToERPFlag) {
-		this.synToERPFlag = synToERPFlag;
-	}
-	
 	public Long getDeliveryTimeMills() {
 		return deliveryTimeMills;
 	}

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -26,7 +26,6 @@ public class Product extends DataEntity<Product> {
     private Integer bigTypeID;//一级商品分类
     private Integer smallTypeID;//二级商品分类
     private Integer tinyTypeID;        // 三级分类Id
-    private Integer selfTypeID;        // selfTypeID
     private Integer shopID;        // 所属供应商Id
     private String searchKey;        // 搜索关键词
     private String productRemarks;//商品备注
@@ -42,19 +41,15 @@ public class Product extends DataEntity<Product> {
     private String addTime;        // 添加时间
     private String updateTime;        // 更新时间
     private String sellNumber;        // 销量
-    private String weekSellNumber;        // weekSellNumber
     private String beforeValidFlag;        // 保存商品状态修改之前的状态（目前只在进行冻结操作时保存）
     private String favoriteTimes;        // 收藏量
     private String commentScore;        // 评论分数
     private String commentTimes;        // 评论次数
-    private String selfRecommendFlag;        // selfRecommendFlag
-    private String sysRecommendFlag;        // sysRecommendFlag
     private String sortIndex;        // 排序值
     private String featuredFlag;        // 供应商主推商品标志 0否 1是
     private String featuredSortIndex;        // 供应商主推商品排序
     private String productCode;        // 商品货号
     private String unit;        // 包装规格
-    private String synToERPFlag;        // 是否推送到ERP，1已推送， 空或0未推送
     private String allAreaFlag;        // 销售区域：1全部区域， 0指定区域
     private String provinceIDs;        // 指定的销售区域
     private String serviceNumber;        // 服务起订量
@@ -63,9 +58,6 @@ public class Product extends DataEntity<Product> {
     private String packageCount;        // 最小包装数量
     private String byFlag;        // 运费：0买家承担， 1卖家承担
     private String normalProductFlag;        // 普通商品标志 1是
-    private String wholeSaleProductFlag;        // wholeSaleProductFlag
-    private String promotionProductFlag;        // promotionProductFlag
-    private String groupBuyProductFlag;        // groupBuyProductFlag
     private String step;        // 购买梯度数（编辑数量时加减的数量）
     private String actFlag;        // 是否活动商品：1是，空或0不是
     private String actType;        // '商品活动类型：1推荐热销、2推荐上新、3团购促销、4无',
@@ -717,14 +709,6 @@ public class Product extends DataEntity<Product> {
         this.tinyTypeID = tinyTypeID;
     }
 
-    public Integer getSelfTypeID() {
-        return selfTypeID;
-    }
-
-    public void setSelfTypeID(Integer selfTypeID) {
-        this.selfTypeID = selfTypeID;
-    }
-
     public Integer getShopID() {
         return shopID;
     }
@@ -814,14 +798,6 @@ public class Product extends DataEntity<Product> {
         this.sellNumber = sellNumber;
     }
 
-    public String getWeekSellNumber() {
-        return weekSellNumber;
-    }
-
-    public void setWeekSellNumber(String weekSellNumber) {
-        this.weekSellNumber = weekSellNumber;
-    }
-
     public String getBeforeValidFlag() {
         return beforeValidFlag;
     }
@@ -854,22 +830,6 @@ public class Product extends DataEntity<Product> {
         this.commentTimes = commentTimes;
     }
 
-    public String getSelfRecommendFlag() {
-        return selfRecommendFlag;
-    }
-
-    public void setSelfRecommendFlag(String selfRecommendFlag) {
-        this.selfRecommendFlag = selfRecommendFlag;
-    }
-
-    public String getSysRecommendFlag() {
-        return sysRecommendFlag;
-    }
-
-    public void setSysRecommendFlag(String sysRecommendFlag) {
-        this.sysRecommendFlag = sysRecommendFlag;
-    }
-
     public String getSortIndex() {
         return sortIndex;
     }
@@ -910,14 +870,6 @@ public class Product extends DataEntity<Product> {
         this.unit = unit;
     }
 
-    public String getSynToERPFlag() {
-        return synToERPFlag;
-    }
-
-    public void setSynToERPFlag(String synToERPFlag) {
-        this.synToERPFlag = synToERPFlag;
-    }
-
     public String getAllAreaFlag() {
         return allAreaFlag;
     }
@@ -982,30 +934,6 @@ public class Product extends DataEntity<Product> {
         this.normalProductFlag = normalProductFlag;
     }
 
-    public String getWholeSaleProductFlag() {
-        return wholeSaleProductFlag;
-    }
-
-    public void setWholeSaleProductFlag(String wholeSaleProductFlag) {
-        this.wholeSaleProductFlag = wholeSaleProductFlag;
-    }
-
-    public String getPromotionProductFlag() {
-        return promotionProductFlag;
-    }
-
-    public void setPromotionProductFlag(String promotionProductFlag) {
-        this.promotionProductFlag = promotionProductFlag;
-    }
-
-    public String getGroupBuyProductFlag() {
-        return groupBuyProductFlag;
-    }
-
-    public void setGroupBuyProductFlag(String groupBuyProductFlag) {
-        this.groupBuyProductFlag = groupBuyProductFlag;
-    }
-
     public String getStep() {
         return step;
     }

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1075,34 +1075,6 @@
         AND p.splitCode != 'E1807059160'
     </select>
 
-    <select id="getOnlineBalance" resultType="com.caimei.modules.order.entity.OrderReceiptRelationPo">
-        SELECT DISTINCT cror.id,
-                        cror.relationType,
-                        cror.receiptId,
-                        cror.associateAmount,
-                        cror.orderId,
-                        cror.delFlag,
-                        cror.mbOrderId,
-                        cror.orderRequestNo,
-                        cror.splitStatus,
-                        cdr.payType
-        FROM cm_receipt_order_relation cror
-                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-                 LEFT JOIN cm_order co ON cror.orderID = co.orderID
-                 LEFT JOIN cm_user_balance_record cubr ON cubr.orderId = cror.orderID
-        WHERE cror.relationType = 2
-          AND cror.delFlag = 0
-          AND cror.splitStatus = 0
-          AND cdr.delFlag = 0
-          AND cdr.payWay = 3
-          AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
-          AND co.organizeID = 0
-          AND co.orderType != 2
-          AND co.refundType != 2
-          AND cubr.balanceType = 10
-          AND cror.associateAmount > 0.01
-    </select>
-
     <select id="getOrderProductByOrderId" resultType="com.caimei.modules.order.entity.OrderProductVo">
         SELECT cop.orderProductID                                                 AS orderProductId,
                cop.orderID                                                        AS orderId,

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -15,7 +15,6 @@
 		a.bigTypeID AS "bigTypeID",
 		ifnull(a.smallTypeID,-1)  AS "smallTypeID",
 		ifnull(a.tinyTypeID,-1) AS "tinyTypeID",
-		a.selfTypeID AS "selfTypeID",
 		a.preferredFlag AS "preferredFlag",
 		a.shopID AS "shopID",
 		a.name AS "name",
@@ -30,28 +29,21 @@
 		a.addTime AS "addTime",
 		a.updateTime AS "updateTime",
 		a.sellNumber AS "sellNumber",
-		a.weekSellNumber AS "weekSellNumber",
 		a.beforeValidFlag AS "beforeValidFlag",
 		a.validFlag AS "validFlag",
 		a.favoriteTimes AS "favoriteTimes",
 		a.commentScore AS "commentScore",
 		a.commentTimes AS "commentTimes",
-		a.selfRecommendFlag AS "selfRecommendFlag",
-		a.sysRecommendFlag AS "sysRecommendFlag",
 		a.sortIndex AS "sortIndex",
 		a.featuredFlag AS "featuredFlag",
 		a.featuredSortIndex AS "featuredSortIndex",
 		a.productCode AS "productCode",
-		a.synToERPFlag AS "synToERPFlag",
 		a.allAreaFlag AS "allAreaFlag",
 		a.provinceIDs AS "provinceIDs",
 		a.serviceNumber AS "serviceNumber",
 		a.packageCount AS "packageCount",
 		a.byFlag AS "byFlag",
 		a.normalProductFlag AS "normalProductFlag",
-		a.wholeSaleProductFlag AS "wholeSaleProductFlag",
-		a.promotionProductFlag AS "promotionProductFlag",
-		a.groupBuyProductFlag AS "groupBuyProductFlag",
 		a.step AS "step",
 		a.actStatus AS "actStatus",
 		a.actFlag AS "actFlag",
@@ -340,7 +332,6 @@
         bigTypeID,
         smallTypeID,
         tinyTypeID,
-        selfTypeID,
         shopID,
         aliasName,
         name,
@@ -352,28 +343,21 @@
         propertiesInfo,
         addTime,
         updateTime,
-        weekSellNumber,
         beforeValidFlag,
         validFlag,
         favoriteTimes,
         commentScore,
         commentTimes,
-        selfRecommendFlag,
-        sysRecommendFlag,
         sortIndex,
         featuredFlag,
         featuredSortIndex,
         productCode,
-        synToERPFlag,
         allAreaFlag,
         provinceIDs,
         serviceNumber,
         packageCount,
         byFlag,
         normalProductFlag,
-        wholeSaleProductFlag,
-        promotionProductFlag,
-        groupBuyProductFlag,
         step,
         actFlag,
         actType,
@@ -420,7 +404,6 @@
         #{bigTypeID},
         #{smallTypeID},
         #{tinyTypeID},
-        #{selfTypeID},
         #{shopID},
         #{aliasName},
         #{name},
@@ -432,28 +415,21 @@
         #{propertiesInfo},
         #{addTime},
         #{updateTime},
-        #{weekSellNumber},
         #{beforeValidFlag},
         #{validFlag},
         #{favoriteTimes},
         #{commentScore},
         #{commentTimes},
-        #{selfRecommendFlag},
-        #{sysRecommendFlag},
         #{sortIndex},
         #{featuredFlag},
         #{featuredSortIndex},
         #{productCode},
-        #{synToERPFlag},
         #{allAreaFlag},
         #{provinceIDs},
         #{serviceNumber},
         #{packageCount},
         #{byFlag},
         #{normalProductFlag},
-        #{wholeSaleProductFlag},
-        #{promotionProductFlag},
-        #{groupBuyProductFlag},
         #{step},
         #{actFlag},
         #{actType},
@@ -502,7 +478,6 @@
         SET productID            = #{id},
             brandID              = #{brandID},
             tinyTypeID           = #{tinyTypeID},
-            selfTypeID           = #{selfTypeID},
             shopID               = #{shopID},
             name                 = #{name},
             searchKey            = #{searchKey},
@@ -514,28 +489,21 @@
             addTime              = #{addTime},
             updateTime           = #{updateTime},
             sellNumber           = #{sellNumber},
-            weekSellNumber       = #{weekSellNumber},
             beforeValidFlag      = #{beforeValidFlag},
             validFlag            = #{validFlag},
             favoriteTimes        = #{favoriteTimes},
             commentScore         = #{commentScore},
             commentTimes         = #{commentTimes},
-            selfRecommendFlag    = #{selfRecommendFlag},
-            sysRecommendFlag     = #{sysRecommendFlag},
             sortIndex            = #{sortIndex},
             featuredFlag         = #{featuredFlag},
             featuredSortIndex    = #{featuredSortIndex},
             productCode          = #{productCode},
-            synToERPFlag         = #{synToERPFlag},
             allAreaFlag          = #{allAreaFlag},
             provinceIDs          = #{provinceIDs},
             serviceNumber        = #{serviceNumber},
             packageCount         = #{packageCount},
             byFlag               = #{byFlag},
             normalProductFlag    = #{normalProductFlag},
-            wholeSaleProductFlag = #{wholeSaleProductFlag},
-            promotionProductFlag = #{promotionProductFlag},
-            groupBuyProductFlag  = #{groupBuyProductFlag},
             step                 = #{step},
             actFlag              = #{actFlag},
             actType              = #{actType},
@@ -872,7 +840,6 @@
             `productCategory`,
         </if>
         `preferredFlag`,
-        `selfTypeID`,
         `shopID`,
         `name`,
         `aliasName`,
@@ -885,28 +852,21 @@
         `propertiesInfo`,
         `addTime`,
         `updateTime`,
-        `weekSellNumber`,
         `beforeValidFlag`,
         `validFlag`,
         `favoriteTimes`,
         `commentScore`,
         `commentTimes`,
-        `selfRecommendFlag`,
-        `sysRecommendFlag`,
         `sortIndex`,
         `featuredFlag`,
         `featuredSortIndex`,
         `productCode`,
-        `synToERPFlag`,
         `allAreaFlag`,
         `provinceIDs`,
         `serviceNumber`,
         `packageCount`,
         `byFlag`,
         `normalProductFlag`,
-        `wholeSaleProductFlag`,
-        `promotionProductFlag`,
-        `groupBuyProductFlag`,
         `step`,
         `actFlag`,
         `actStatus`,
@@ -937,7 +897,6 @@
             #{productCategory},
         </if>
         #{preferredFlag},
-        #{selfTypeID},
         #{shopID},
         #{name},
         #{aliasName},
@@ -950,28 +909,21 @@
         #{propertiesInfo},
         #{addTime},
         #{updateTime},
-        #{weekSellNumber},
         #{beforeValidFlag},
         #{validFlag},
         #{favoriteTimes},
         #{commentScore},
         #{commentTimes},
-        #{selfRecommendFlag},
-        #{sysRecommendFlag},
         #{sortIndex},
         #{featuredFlag},
         #{featuredSortIndex},
         #{productCode},
-        #{synToERPFlag},
         #{allAreaFlag},
         #{provinceIDs},
         #{serviceNumber},
         #{packageCount},
         #{byFlag},
         #{normalProductFlag},
-        #{wholeSaleProductFlag},
-        #{promotionProductFlag},
-        #{groupBuyProductFlag},
         #{step},
         #{actFlag},
         #{actStatus},
@@ -1454,9 +1406,6 @@
             <if test="updateTime != null and updateTime !=''">
                 updateTime = #{updateTime},
             </if>
-            <if test="weekSellNumber != null and weekSellNumber !=''">
-                weekSellNumber = #{weekSellNumber},
-            </if>
             <if test="beforeValidFlag != null and beforeValidFlag !=''">
                 beforeValidFlag = #{beforeValidFlag},
             </if>
@@ -1472,12 +1421,6 @@
             <if test="commentTimes != null and commentTimes !=''">
                 commentTimes = #{commentTimes},
             </if>
-            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">
-                selfRecommendFlag = #{selfRecommendFlag},
-            </if>
-            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">
-                sysRecommendFlag = #{sysRecommendFlag},
-            </if>
             <if test="sortIndex != null and sortIndex != ''">
                 sortIndex = #{sortIndex},
             </if>
@@ -1490,9 +1433,6 @@
             <if test="productCode != null and productCode !=''">
                 productCode = #{productCode},
             </if>
-            <if test="synToERPFlag != null and synToERPFlag !=''">
-                synToERPFlag = #{synToERPFlag},
-            </if>
             <if test="allAreaFlag != null and allAreaFlag !=''">
                 allAreaFlag = #{allAreaFlag},
             </if>
@@ -1511,15 +1451,6 @@
             <if test="normalProductFlag != null and normalProductFlag !=''">
                 normalProductFlag = #{normalProductFlag},
             </if>
-            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">
-                wholeSaleProductFlag = #{wholeSaleProductFlag},
-            </if>
-            <if test="promotionProductFlag != null and promotionProductFlag !=''">
-                promotionProductFlag = #{promotionProductFlag},
-            </if>
-            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">
-                groupBuyProductFlag = #{groupBuyProductFlag},
-            </if>
             <if test="step != null and step !=''">
                 step = #{step},
             </if>

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -18,7 +18,6 @@
         ifnull(a.smallTypeID,0)  AS "smallTypeID",
         ifnull(a.tinyTypeID,0) AS "tinyTypeID",
         a.productCategory AS "productCategory",
-        a.selfTypeID AS "selfTypeID",
         a.preferredFlag AS "preferredFlag",
         a.shopID AS "shopID",
         a.name AS "name",
@@ -33,28 +32,21 @@
         a.addTime AS "addTime",
         a.updateTime AS "updateTime",
         a.sellNumber AS "sellNumber",
-        a.weekSellNumber AS "weekSellNumber",
         a.beforeValidFlag AS "beforeValidFlag",
         a.validFlag AS "validFlag",
         a.favoriteTimes AS "favoriteTimes",
         a.commentScore AS "commentScore",
         a.commentTimes AS "commentTimes",
-        a.selfRecommendFlag AS "selfRecommendFlag",
-        a.sysRecommendFlag AS "sysRecommendFlag",
         a.sortIndex AS "sortIndex",
         a.featuredFlag AS "featuredFlag",
         a.featuredSortIndex AS "featuredSortIndex",
         a.productCode AS "productCode",
-        a.synToERPFlag AS "synToERPFlag",
         a.allAreaFlag AS "allAreaFlag",
         a.provinceIDs AS "provinceIDs",
         a.serviceNumber AS "serviceNumber",
         a.packageCount AS "packageCount",
         a.byFlag AS "byFlag",
         a.normalProductFlag AS "normalProductFlag",
-        a.wholeSaleProductFlag AS "wholeSaleProductFlag",
-        a.promotionProductFlag AS "promotionProductFlag",
-        a.groupBuyProductFlag AS "groupBuyProductFlag",
         a.step AS "step",
         a.actStatus AS "actStatus",
         a.actFlag AS "actFlag",
@@ -325,7 +317,6 @@
                             brandID,
                             tinyTypeID,
                             productCategory,
-                            selfTypeID,
                             shopID,
                             name,
                             searchKey,
@@ -337,28 +328,21 @@
                             addTime,
                             updateTime,
                             sellNumber,
-                            weekSellNumber,
                             beforeValidFlag,
                             validFlag,
                             favoriteTimes,
                             commentScore,
                             commentTimes,
-                            selfRecommendFlag,
-                            sysRecommendFlag,
                             sortIndex,
                             featuredFlag,
                             featuredSortIndex,
                             productCode,
-                            synToERPFlag,
                             allAreaFlag,
                             provinceIDs,
                             serviceNumber,
                             packageCount,
                             byFlag,
                             normalProductFlag,
-                            wholeSaleProductFlag,
-                            promotionProductFlag,
-                            groupBuyProductFlag,
                             step,
                             actFlag,
                             actType,
@@ -371,7 +355,6 @@
                 #{brandID},
                 #{tinyTypeID},
                 #{productCategory},
-                #{selfTypeID},
                 #{shopID},
                 #{name},
                 #{searchKey},
@@ -383,28 +366,21 @@
                 #{addTime},
                 #{updateTime},
                 #{sellNumber},
-                #{weekSellNumber},
                 #{beforeValidFlag},
                 #{validFlag},
                 #{favoriteTimes},
                 #{commentScore},
                 #{commentTimes},
-                #{selfRecommendFlag},
-                #{sysRecommendFlag},
                 #{sortIndex},
                 #{featuredFlag},
                 #{featuredSortIndex},
                 #{productCode},
-                #{synToERPFlag},
                 #{allAreaFlag},
                 #{provinceIDs},
                 #{serviceNumber},
                 #{packageCount},
                 #{byFlag},
                 #{normalProductFlag},
-                #{wholeSaleProductFlag},
-                #{promotionProductFlag},
-                #{groupBuyProductFlag},
                 #{step},
                 #{actFlag},
                 #{actType},
@@ -420,7 +396,6 @@
             brandID              = #{brandID},
             tinyTypeID           = #{tinyTypeID},
             productCategory      = #{productCategory},
-            selfTypeID           = #{selfTypeID},
             shopID               = #{shopID},
             name                 = #{name},
             searchKey            = #{searchKey},
@@ -432,28 +407,21 @@
             addTime              = #{addTime},
             updateTime           = #{updateTime},
             sellNumber           = #{sellNumber},
-            weekSellNumber       = #{weekSellNumber},
             beforeValidFlag      = #{beforeValidFlag},
             validFlag            = #{validFlag},
             favoriteTimes        = #{favoriteTimes},
             commentScore         = #{commentScore},
             commentTimes         = #{commentTimes},
-            selfRecommendFlag    = #{selfRecommendFlag},
-            sysRecommendFlag     = #{sysRecommendFlag},
             sortIndex            = #{sortIndex},
             featuredFlag         = #{featuredFlag},
             featuredSortIndex    = #{featuredSortIndex},
             productCode          = #{productCode},
-            synToERPFlag         = #{synToERPFlag},
             allAreaFlag          = #{allAreaFlag},
             provinceIDs          = #{provinceIDs},
             serviceNumber        = #{serviceNumber},
             packageCount         = #{packageCount},
             byFlag               = #{byFlag},
             normalProductFlag    = #{normalProductFlag},
-            wholeSaleProductFlag = #{wholeSaleProductFlag},
-            promotionProductFlag = #{promotionProductFlag},
-            groupBuyProductFlag  = #{groupBuyProductFlag},
             step                 = #{step},
             actFlag              = #{actFlag},
             actType              = #{actType},
@@ -504,9 +472,6 @@
             <if test="preferredFlag != null and preferredFlag !=''">
                 preferredFlag = #{preferredFlag},
             </if>
-            <if test="selfTypeID != null and selfTypeID !=''">
-                selfTypeID = #{selfTypeID},
-            </if>
             <if test="shopID != null and shopID !=''">
                 shopID = #{shopID},
             </if>
@@ -561,9 +526,6 @@
             <if test="sellNumber != null and sellNumber !=''">
                 sellNumber = #{sellNumber},
             </if>
-            <if test="weekSellNumber != null and weekSellNumber !=''">
-                weekSellNumber = #{weekSellNumber},
-            </if>
             <if test="beforeValidFlag != null and beforeValidFlag !=''">
                 beforeValidFlag = #{beforeValidFlag},
             </if>
@@ -579,12 +541,6 @@
             <if test="commentTimes != null and commentTimes !=''">
                 commentTimes = #{commentTimes},
             </if>
-            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">
-                selfRecommendFlag = #{selfRecommendFlag},
-            </if>
-            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">
-                sysRecommendFlag = #{sysRecommendFlag},
-            </if>
             <if test="sortIndex != null and sortIndex != ''">
                 sortIndex = #{sortIndex},
             </if>
@@ -600,9 +556,6 @@
             <if test="unit != null and unit !=''">
                 unit = #{unit},
             </if>
-            <if test="synToERPFlag != null and synToERPFlag !=''">
-                synToERPFlag = #{synToERPFlag},
-            </if>
             <if test="allAreaFlag != null and allAreaFlag !=''">
                 allAreaFlag = #{allAreaFlag},
             </if>
@@ -627,15 +580,6 @@
             <if test="normalProductFlag != null and normalProductFlag !=''">
                 normalProductFlag = #{normalProductFlag},
             </if>
-            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">
-                wholeSaleProductFlag = #{wholeSaleProductFlag},
-            </if>
-            <if test="promotionProductFlag != null and promotionProductFlag !=''">
-                promotionProductFlag = #{promotionProductFlag},
-            </if>
-            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">
-                groupBuyProductFlag = #{groupBuyProductFlag},
-            </if>
             <if test="step != null and step !=''">
                 step = #{step},
             </if>