【数据库整理】订单相关

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchase.java

@@ -26,7 +26,7 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private String status;        // 状态：1待审核、2审核通过、3审核不通过
     private String returnedWay;        // 退款方式 1有支付有退款(退款方式可多选具体参考以上金额)、4未支付无退款（未支付发起退款）
     private String payType;//付款方式 付款方式 1建设银行7297, 2中信银行0897, 3中信银行7172, 4广发银行0115, 5广发银行5461
-    private String returnedBankInfo;        // 退款银行信息（银行名称、户名、开户行、银行账号）【V6.1.1版本已废弃拆分显示】
+    //private String returnedBankInfo;        // 退款银行信息（银行名称、户名、开户行、银行账号）【V6.1.1版本已废弃拆分显示】
     private String operatingOrderStatus;    //发起该操作时订单状态快照：0待确认,11待收待发,12待收部发,13待收全发,21部收待发,22部收部发,23部收全发,31已收待发,32已收部发,33已收全发,4交易完成,5订单完成,6已关闭,7交易全退
     private Double returnedPurchaseFee;        // 退款(退货)总金额
     private Double refundFee;        // 退款总额(给买家)
@@ -150,14 +150,14 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
         this.returnedWay = returnedWay;
     }
 
-    @Length(min = 0, max = 300, message = "退款银行信息（银行名称、户名、开户行、银行账号）长度必须介于 0 和 300 之间")
-    public String getReturnedBankInfo() {
-        return returnedBankInfo;
-    }
-
-    public void setReturnedBankInfo(String returnedBankInfo) {
-        this.returnedBankInfo = returnedBankInfo;
-    }
+//    @Length(min = 0, max = 300, message = "退款银行信息（银行名称、户名、开户行、银行账号）长度必须介于 0 和 300 之间")
+//    public String getReturnedBankInfo() {
+//        return returnedBankInfo;
+//    }
+//
+//    public void setReturnedBankInfo(String returnedBankInfo) {
+//        this.returnedBankInfo = returnedBankInfo;
+//    }
 
 
     public Double getReturnedPurchaseFee() {

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchaseProduct.java

@@ -21,7 +21,7 @@ public class CmReturnedPurchaseProduct extends DataEntity<CmReturnedPurchaseProd
 	private Integer applicationCancelNum;		// 申请取消数量
 	private Integer actualReturnedNum;		// 实际退货数量
 	private Integer actualCancelNum;		// 实际取消数量
-	private String returnedReceiver;		// 退款接收方：1采美、2供应商、3采美及供应商
+//	private String returnedReceiver;		// 退款接收方：1采美、2供应商、3采美及供应商
 
 	private String status;	//退货状态	状态：1退货退款中、2已完成、3已取消
 
@@ -134,13 +134,13 @@ public class CmReturnedPurchaseProduct extends DataEntity<CmReturnedPurchaseProd
 		this.status = status;
 	}
 
-	public String getReturnedReceiver() {
-		return returnedReceiver;
-	}
-
-	public void setReturnedReceiver(String returnedReceiver) {
-		this.returnedReceiver = returnedReceiver;
-	}
+//	public String getReturnedReceiver() {
+//		return returnedReceiver;
+//	}
+//
+//	public void setReturnedReceiver(String returnedReceiver) {
+//		this.returnedReceiver = returnedReceiver;
+//	}
 
 	public static long getSerialVersionUID() {
 		return serialVersionUID;

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -44,7 +44,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private Double singleOtherFee;//   decimal(20,6) comment '单个应付第三方金额',
     private Double singleCmFee;//   decimal(20,6) comment '单个应付采美金额',
     private Double shouldPayFee;//   decimal(20,6) comment '应付金额',
-    private String commentFlag;//        national char(1) comment '是否已评论：1是，空或0未评论',
+    //private String commentFlag;//        national char(1) comment '是否已评论：1是，空或0未评论',
     private Double price0;//   float(10,2),
     private Double price1;//   float comment '普通会员价',
     private Double totalFee;//   float comment '总价',
@@ -397,13 +397,13 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
         this.shouldPayFee = shouldPayFee;
     }
 
-    public String getCommentFlag() {
-        return commentFlag;
-    }
-
-    public void setCommentFlag(String commentFlag) {
-        this.commentFlag = commentFlag;
-    }
+//    public String getCommentFlag() {
+//        return commentFlag;
+//    }
+//
+//    public void setCommentFlag(String commentFlag) {
+//        this.commentFlag = commentFlag;
+//    }
 
     public Double getNormalPrice() {
         return normalPrice;

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -381,7 +381,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                         shopOrderReturned.setShopName(item.getShopName());
                         shopOrderReturned.setShopID(item.getShopID());
                         shopOrderReturned.setShopOrderID(item.getShopOrderID());
-                        shopOrderReturned.setReturnedReceiver(item.getReturnedReceiver());
+                        //shopOrderReturned.setReturnedReceiver(item.getReturnedReceiver());
                         shopOrderReturned.setCommercialCode(item.getCommercialCode());
                         NewShopOrder shopOrder = newShopOrderService.findByShopOrderID(item.getShopOrderID());
                         if (null != shopOrder) {

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -210,7 +210,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 o.setShopProductAmount(copCostPrice * o.getNum());
                 discountFee += (o.getDiscountFee() == null ? 0 : o.getDiscountFee()); //主订单统计经理折扣
                 preferential += (o.getPreferential() == null ? 0 : o.getPreferential()); //主订单统计优惠
-                o.setCommentFlag("0");//未评论
                 o.setUseBalanceAmount(0D);//余额
                 o.setIsGiftProduct("0");//【旧】赠品标识
                 Product product = productDao.get(o.getProductID() + "");

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

@@ -23,7 +23,7 @@ public class CmOrderProduct extends DataEntity<CmOrderProduct>{
     private Float fee; //
     private String note; //
     private String status; //
-    private String commentFlag; //
+    //private String commentFlag; //
     private Float normalPrice; //
     private Float price0; // 普通价
     private Float price1; // 会员价
@@ -157,13 +157,13 @@ public class CmOrderProduct extends DataEntity<CmOrderProduct>{
         this.status = status;
     }
 
-    public String getCommentFlag() {
-        return commentFlag;
-    }
-
-    public void setCommentFlag(String commentFlag) {
-        this.commentFlag = commentFlag;
-    }
+//    public String getCommentFlag() {
+//        return commentFlag;
+//    }
+//
+//    public void setCommentFlag(String commentFlag) {
+//        this.commentFlag = commentFlag;
+//    }
 
     public Float getNormalPrice() {
         return normalPrice;

src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml

@@ -1,41 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.bulkpurchase.dao.CmClubDao">
-    <!--	<resultMap id="resultClub" type="CmClub">
-            <id column="clubID" property="id"></id>
-            <result property="userID" column="userID"></result>
-            <result column="clubTypeID" property="clubTypeID"></result>
-            <result column="name" property="name"></result>
-            <result column="nameEn" property="nameEn"></result>
-            <result column="site" property="site"></result>
-            <result column="logo" property="logo"></result>
-            <result column="level" property="level"></result>
-            <result column="score" property="score"></result>
-            <result column="subClubCount" property="subClubCount"></result>
-            <result column="legalPerson" property="legalPerson"></result>
-            <result column="registeredCapital" property="registeredCapital"></result>
-            <result column="mainClubID" property="mainClubID"></result>
-            <result column="turnover" property="turnover"></result>
-            <result column="linkMan" property="linkMan"></result>
-            <result column="contractPhone" property="contractPhone"></result>
-            <result column="contractMobile" property="contractMobile"></result>
-            <association javaType="caimei.modules.address.entity.Address" ></association>
-            <result column="addressID" property="defaultAddress.addressID"></result>
-            <result column="shouHuoRen" property="defaultAddress.shouHuoRen"></result>
-            <result column="townID" property="defaultAddress.townID"></result>
-            <result column="address" property="defaultAddress.address"></result>
-            <result column="postalCode" property="defaultAddress.postalCode"></result>
-            <result column="phone" property="defaultAddress.phone"></result>
-            <result column="mobile" property="defaultAddress.mobile"></result>
-            <result column="defaultFlag" property="defaultAddress.defaultFlag"></result>
-
-        </resultMap>-->
-
     <resultMap id="resultClub" type="CmClub">
         <result column="clubID" property="id"/>
         <result column="name" property="name"/>
         <result column="address" property="address"/>
-        <result column="zipCode" property="zipCode"/>
         <result column="contractPhone" property="contractPhone"/>
         <result column="contractMobile" property="contractMobile"/>
         <result column="linkMan" property="linkMan"/>
@@ -43,74 +12,34 @@
     <sql id="cmClubColumns">
 		a.clubID AS "id",
 		a.userID AS "userID",
-		a.clubTypeID AS "clubTypeID",
 		a.name AS "name",
-		a.nameEn AS "nameEn",
-		a.site AS "site",
 		a.logo AS "logo",
 		a.townID as townID,
 		a.address as address,
-		a.level AS "level",
-		a.score AS "score",
-		a.subClubCount AS "subClubCount",
 		a.legalPerson AS "legalPerson",
-		a.registeredCapital AS "registeredCapital",
-		a.mainClubID AS "mainClubID",
-		a.turnover AS "turnover",
 		a.linkMan AS "linkMan",
 		a.contractPhone AS "contractPhone",
 		a.contractMobile AS "contractMobile",
 		a.fax AS "fax",
-		a.zipCode AS "zipCode",
-		a.linkMan1 AS "linkMan1",
-		a.duty1 AS "duty1",
-		a.contractPhone1 AS "contractPhone1",
-		a.contractMobile1 AS "contractMobile1",
-		a.contractQQ1 AS "contractQQ1",
-		a.wechat1 AS "wechat1",
-		a.contractEmail1 AS "contractEmail1",
-		a.linkMan2 AS "linkMan2",
-		a.duty2 AS "duty2",
-		a.contractPhone2 AS "contractPhone2",
-		a.contractMobile2 AS "contractMobile2",
-		a.contractQQ2 AS "contractQQ2",
-		a.wechat2 AS "wechat2",
-		a.contractEmail2 AS "contractEmail2",
-		a.scope AS "scope",
 		a.info AS "info",
-		a.lng AS "lng",
-		a.lat AS "lat",
 		a.addTime AS "addTime",
-		a.favoriteTimes AS "favoriteTimes",
-		a.payFlag1 AS "payFlag1",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
 		a.status AS "status",
-		a.clubInvitationStatus AS "clubInvitationStatus",
-		a.recAddress AS "recAddress",
 		a.businessLicenseImage AS "businessLicenseImage",
-		a.sortIndex AS "sortIndex",
-		a.recTownID AS "recTownID",
 		a.defaultServiceProviderID AS "defaultServiceProviderID",
 		a.defaultServiceProviderUpdTime AS "defaultServiceProviderUpdTime",
-		a.firstServiceProviderFlag AS "firstServiceProviderFlag",
-
 		a.sname AS "sname",
 		a.flag AS "flag",
 		a.scanFlag AS "scanFlag",
 		a.mainServiceProviderID AS "mainServiceProviderID",
 		a.spID AS "spID",
-		a.agreement AS "agreement",
-		a.scale AS "scale",
-		a.empnum AS "empnum",
 		a.mainpro AS "mainpro",
-		a.remark AS "remark",
 		a.provinceID AS "provinceID",
 		a.cityID AS "cityID",
 		a.inviterName AS "inviterName",
 		a.inviterBindID AS "inviterBindID",
 		a.scanTime AS "scanTime",
-		a.checkTime AS "checkTime",
 		a.headpic AS "headpic"
 	</sql>
 
@@ -179,143 +108,65 @@
     <insert id="insert" parameterType="CmClub" keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO club(
 			userID,
-			clubTypeID,
 			name,
-			nameEn,
-			site,
 			logo,
-			level,
-			score,
-			subClubCount,
 			legalPerson,
 			townID,
 			address,
-			registeredCapital,
-			mainClubID,
-			turnover,
 			linkMan,
 			contractPhone,
 			contractMobile,
 			fax,
-			zipCode,
-			linkMan1,
-			duty1,
-			contractPhone1,
-			contractMobile1,
-			contractQQ1,
-			wechat1,
-			contractEmail1,
-			linkMan2,
-			duty2,
-			contractPhone2,
-			contractMobile2,
-			contractQQ2,
-			wechat2,
-			contractEmail2,
-			scope,
 			info,
-			lng,
-			lat,
 			addTime,
-			favoriteTimes,
-			payFlag1,
 			auditTime,
 			auditNote,
 			status,
-			clubInvitationStatus,
-			recAddress,
 			businessLicenseImage,
-			sortIndex,
-			recTownID,
 			defaultServiceProviderID,
 			defaultServiceProviderUpdTime,
-			firstServiceProviderFlag,
 			sname,
 			flag,
 			scanFlag,
 			mainServiceProviderID,
 			spID,
-			agreement,
-			scale,
-			empnum,
 			mainpro,
-			remark,
 			provinceID,
 			cityID,
 			inviterName,
 			inviterBindID,
 			scanTime,
-			checkTime,
 			headpic
 		) VALUES (
 			#{userID},
-			#{clubTypeID},
 			#{name},
-			#{nameEn},
-			#{site},
 			#{logo},
-			#{level},
-			#{score},
-			#{subClubCount},
 			#{legalPerson},
 			#{townID},
 			#{address},
-			#{registeredCapital},
-			#{mainClubID},
-			#{turnover},
 			#{linkMan},
 			#{contractPhone},
 			#{contractMobile},
 			#{fax},
-			#{zipCode},
-			#{linkMan1},
-			#{duty1},
-			#{contractPhone1},
-			#{contractMobile1},
-			#{contractQQ1},
-			#{wechat1},
-			#{contractEmail1},
-			#{linkMan2},
-			#{duty2},
-			#{contractPhone2},
-			#{contractMobile2},
-			#{contractQQ2},
-			#{wechat2},
-			#{contractEmail2},
-			#{scope},
 			#{info},
-			#{lng},
-			#{lat},
 			#{addTime},
-			#{favoriteTimes},
-			#{payFlag1},
 			#{auditTime},
 			#{auditNote},
 			#{status},
-			#{clubInvitationStatus},
-			#{recAddress},
 			#{businessLicenseImage},
-			#{sortIndex},
-			#{recTownID},
 			#{defaultServiceProviderID},
 			#{defaultServiceProviderUpdTime},
-			#{firstServiceProviderFlag},
 			#{sname},
 			#{flag},
 			#{scanFlag},
 			#{mainServiceProviderID},
 			#{spID},
-			#{agreement},
-			#{scale},
-			#{empnum},
 			#{mainpro},
-			#{remark},
 			#{provinceID},
 			#{cityID},
 			#{inviterName},
 			#{inviterBindID},
 			#{scanTime},
-			#{checkTime},
 			#{headpic}
 		)
 	</insert>
@@ -323,79 +174,39 @@
     <update id="update">
 		UPDATE club SET
 			userID = #{userID},
-			clubTypeID = #{clubTypeID},
 			name = #{name},
-			nameEn = #{nameEn},
-			site = #{site},
 			logo = #{logo},
-			level = #{level},
-			score = #{score},
-			subClubCount = #{subClubCount},
 			legalPerson = #{legalPerson},
 			townID = #{townID},
 			address = #{address},
-			registeredCapital = #{registeredCapital},
-			mainClubID = #{mainClubID},
-			turnover = #{turnover},
 			linkMan = #{linkMan},
 			contractPhone = #{contractPhone},
 			contractMobile = #{contractMobile},
 			fax = #{fax},
-			zipCode = #{zipCode},
-			linkMan1 = #{linkMan1},
-			duty1 = #{duty1},
-			contractPhone1 = #{contractPhone1},
-			contractMobile1 = #{contractMobile1},
-			contractQQ1 = #{contractQQ1},
-			wechat1 = #{wechat1},
-			contractEmail1 = #{contractEmail1},
-			linkMan2 = #{linkMan2},
-			duty2 = #{duty2},
-			contractPhone2 = #{contractPhone2},
-			contractMobile2 = #{contractMobile2},
-			contractQQ2 = #{contractQQ2},
-			wechat2 = #{wechat2},
-			contractEmail2 = #{contractEmail2},
-			scope = #{scope},
 			info = #{info},
-			lng = #{lng},
-			lat = #{lat},
 			addTime = #{addTime},
-			favoriteTimes = #{favoriteTimes},
-			payFlag1 = #{payFlag1},
 			auditTime = #{auditTime},
 			auditNote = #{auditNote},
 			status = #{status},
-			clubInvitationStatus = #{clubInvitationStatus},
-			recAddress = #{recAddress},
 			<if test="businessLicenseImage != null and businessLicenseImage != 'null'  and businessLicenseImage != ''">
 			businessLicenseImage = #{businessLicenseImage},
 			</if>
 			<if test="headpic != null  and headpic != 'null'  and headpic != ''">
 			headpic = #{headpic},
 			</if>
-			sortIndex = #{sortIndex},
-			recTownID = #{recTownID},
 			defaultServiceProviderID = #{defaultServiceProviderID},
 			defaultServiceProviderUpdTime = #{defaultServiceProviderUpdTime},
-			firstServiceProviderFlag = #{firstServiceProviderFlag},
 			sname = #{sname},
 			flag = #{flag},
 			scanFlag =#{scanFlag},
 			mainServiceProviderID = #{mainServiceProviderID},
 			spID = #{spID},
-			agreement = #{agreement},
-			scale = #{scale},
-			empnum = #{empnum},
 			mainpro = #{mainpro},
-			remark = #{remark},
 			provinceID = #{provinceID},
 			cityID = #{cityID},
 			inviterName = #{inviterName},
 			inviterBindID = #{inviterBindID},
-			scanTime = #{scanTime},
-			checkTime = #{checkTime}
-
+			scanTime = #{scanTime}
 		WHERE clubid = #{id}
 	</update>
 

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

@@ -11,7 +11,6 @@
 		a.returnedWay AS "returnedWay",
 		a.payType AS "payType",
 		a.operatingOrderStatus AS "operatingOrderStatus",
-		a.returnedBankInfo AS "returnedBankInfo",
 		a.returnedPurchaseFee AS "returnedPurchaseFee",
 		a.refundFee AS "refundFee",
 		a.image1 AS "image1",
@@ -196,7 +195,6 @@
 			returnedWay,
 			payType,
 			operatingOrderStatus,
-			returnedBankInfo,
 			bankAccountName,
 			bankAccountNo,
 			openBank,
@@ -225,7 +223,6 @@
 			#{returnedWay},
 			#{payType},
 			#{operatingOrderStatus},
-			#{returnedBankInfo},
 			#{bankAccountName},
 			#{bankAccountNo},
 			#{openBank},
@@ -291,9 +288,6 @@
 			<if test="operatingOrderStatus != null and operatingOrderStatus != ''" >
 				operatingOrderStatus = #{operatingOrderStatus},
 			</if>
-            <if test="returnedBankInfo != null and returnedBankInfo != ''" >
-                returnedBankInfo = #{returnedBankInfo},
-            </if>
 			<if test="bankAccountName != null and bankAccountName != ''" >
 				bankAccountName = #{bankAccountName},
 			</if>

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

@@ -78,7 +78,6 @@
 			orderProductID,
 			shopID,
 			shopOrderID,
-			returnedReceiver,
 			applicationReturnedNum,
 			applicationCancelNum,
 			actualReturnedNum,
@@ -90,7 +89,6 @@
 			#{orderProductID},
 			#{shopID},
 			#{shopOrderID},
-			#{returnedReceiver},
 			#{applicationReturnedNum},
 			#{applicationCancelNum},
 			#{actualReturnedNum},
@@ -104,7 +102,6 @@
 			productID = #{productID},
 			orderProductID = #{orderProductID},
 			shopID = #{shopID},
-			returnedReceiver = #{returnedReceiver},
 			applicationReturnedNum = #{applicationReturnedNum},
 			applicationCancelNum = #{applicationCancelNum},
 			actualReturnedNum = #{actualReturnedNum},
@@ -114,7 +111,6 @@
 
     <update id="updateApply" parameterType="CmReturnedPurchaseProduct">
         UPDATE cm_returned_purchase_product SET
-			returnedReceiver = #{returnedReceiver},
 			actualReturnedNum = #{actualReturnedNum},
 			actualCancelNum = #{actualCancelNum}
         WHERE id = #{id}

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

@@ -24,15 +24,11 @@
 		a.note AS note,
 		a.clubID AS clubID,
 		a.clubScanTime AS clubScanTime,
-		a.payWay AS payWay,
 		a.orderSource AS orderSource,
 		a.orderTime AS orderTime,
 		a.confirmTime AS confirmTime,
 		a.productCount AS productCount,
 		a.presentCount AS presentCount,
-		a.cooFreeFlag AS cooFreeFlag,
-		a.cooFreeRate AS cooFreeRate,
-		a.cooFreeAmount AS cooFreeAmount,
 		a.confirmFlag AS confirmFlag,
 		a.clauseID AS clauseID,
 		a.clauseContent AS clauseContent,
@@ -84,7 +80,6 @@
         <result column="alreadyReceipt" property="alreadyReceipt"/>
         <result column="unReceipt" property="unReceipt"/>
         <result column="payTotalFee" property="payTotalFee"/>
-        <result column="payWay" property="payWay"/>
         <result column="status" property="status"/>
         <collection property="newShopOrders" ofType="com.caimei.modules.order.entity.NewShopOrder"
                     select="loadShopOrders" column="orderNo" fetchType="eager">
@@ -482,9 +477,6 @@
 			<if test="clubScanTime != null" >
 				clubScanTime = #{clubScanTime,jdbcType=VARCHAR},
 			</if>
-			<if test="payWay != null" >
-				payWay = #{payWay,jdbcType=INTEGER},
-			</if>
 			<if test="orderSource != null" >
 				orderSource = #{orderSource,jdbcType=CHAR},
 			</if>
@@ -497,15 +489,6 @@
 			<if test="presentCount != null" >
 				presentCount = #{presentCount,jdbcType=INTEGER},
 			</if>
-			<if test="cooFreeFlag != null" >
-				cooFreeFlag = #{cooFreeFlag,jdbcType=CHAR},
-			</if>
-			<if test="cooFreeRate != null" >
-				cooFreeRate = #{cooFreeRate,jdbcType=INTEGER},
-			</if>
-			<if test="cooFreeAmount != null" >
-				cooFreeAmount = #{cooFreeAmount,jdbcType=DECIMAL},
-			</if>
 			<if test="confirmFlag != null" >
 				confirmFlag = #{confirmFlag,jdbcType=CHAR},
 			</if>

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

@@ -61,7 +61,6 @@
 		  a.`singleOtherFee` AS `singleOtherFee`,
 		  a.`singleCmFee` AS `singleCmFee`,
 		  a.`status` AS `status`,
-		  a.`commentFlag` AS `commentFlag`,
 		  a.`totalBeans` AS `totalBeans`,
 		  a.`useBalanceAmount` AS `useBalanceAmount`,
 		  a.`useBeanAmount` AS `useBeanAmount`,
@@ -82,7 +81,6 @@
 		  a.`preferential` AS `preferential`,
 		  (select mainImage from product p where p.productID = a.productID) AS image,
 		  a.`discountFee` AS `discountFee`,
-		  (select cso.status from cm_shop_order cso where cso.shopOrderID = a.shopOrderID) AS status,
 		  a.`productUnit` AS `productUnit`,
 		  a.`productImage` AS `productImage`,
 		  a.`shopName` AS `shopName`,
@@ -242,7 +240,6 @@
 			singleOtherFee,
 			singleCmFee,
 			shouldPayFee,
-			commentFlag,
 			normalPrice,
 			totalFee,
 			totalBeans,
@@ -306,7 +303,6 @@
 			#{singleOtherFee},
 			#{singleCmFee},
 			#{shouldPayFee},
-			#{commentFlag},
 			#{normalPrice},
 			#{totalFee},
 			#{totalBeans},
@@ -387,7 +383,6 @@
 		singleOtherFee = #{singleOtherFee,jdbcType=DECIMAL},
 		singleCmFee = #{singleCmFee,jdbcType=DECIMAL},
 		shouldPayFee = #{shouldPayFee,jdbcType=DECIMAL},
-		commentFlag = #{commentFlag,jdbcType=CHAR},
 		totalFee = #{totalFee,jdbcType=REAL},
 		totalBeans = #{totalBeans,jdbcType=DECIMAL},
 		useBalanceAmount = #{useBalanceAmount,jdbcType=VARCHAR},

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

@@ -13,7 +13,6 @@
 			a.itemCount  AS itemCount,
 			a.townID  AS townID,
 			a.productAmount  AS productAmount,
-			a.fee  AS fee,
 			a.discountAmount AS  discountAmount,
 			a.accountAmount AS  accountAmount,
 			a.totalAmount AS  totalAmount,
@@ -48,7 +47,6 @@
 			a.preferential AS preferential,
 			a.outStoreNum AS outStoreNum,
 			IFNULL(a.outStoreTimes, 0) AS outStoreTimes,
-			a.discountFee AS discountFee,
 			a.splitFlag AS splitFlag,
 			a.autoReceiveTimeMills AS autoReceiveTimeMills,
 			a.autoOverTimeMills AS autoOverTimeMills,
@@ -94,14 +92,12 @@
 			itemCount,
 			townID,
 			productAmount,
-			fee,
 			discountAmount,
 			accountAmount,
 			totalAmount,
 			payFlag,
 			payTime,
 			finishTime,
-			status,
 			refundStatus,
 			needPayAmount,
 			canRefundAmount,
@@ -128,7 +124,6 @@
 			deliveryTimeMills,
 			presentNum,
 			preferential,
-			discountFee,
 			splitFlag,
 			autoReceiveTimeMills,
 			autoOverTimeMills,
@@ -150,14 +145,12 @@
 			#{itemCount},
 			#{townID},
 			#{productAmount},
-			#{fee},
 			#{discountAmount},
 			#{accountAmount},
 			#{totalAmount},
 			#{payFlag},
 			#{payTime},
 			#{finishTime},
-			#{status},
 			#{refundStatus},
 			#{needPayAmount},
 			#{canRefundAmount},
@@ -184,7 +177,6 @@
 			#{deliveryTimeMills},
 			#{presentNum},
 			#{preferential},
-			#{discountFee},
 			#{splitFlag},
 			#{autoReceiveTimeMills},
 			#{autoOverTimeMills},
@@ -226,9 +218,6 @@
 			<if test="shopID != null and itemCount != ''" >
 				AND a.shopID = #{shopID}
 			</if>
-			<if test="status != null and itemCount != ''" >
-				AND a.status = #{status}
-			</if>
 			<if test="payFlag != null and itemCount != ''" >
 				AND a.payFlag = #{payFlag}
 			</if>
@@ -278,9 +267,6 @@
 			<if test="productAmount != null and productAmount != ''" >
 				productAmount = #{productAmount},
 			</if>
-			<if test="fee != null and fee != ''" >
-				fee = #{fee},
-			</if>
 			<if test="discountAmount != null and discountAmount != ''" >
 				discountAmount = #{discountAmount},
 			</if>
@@ -299,9 +285,6 @@
 			<if test="finishTime != null and finishTime != ''" >
 				finishTime = #{finishTime},
 			</if>
-			<if test="status != null and status != ''" >
-				status = #{status},
-			</if>
 			<if test="refundStatus != null and refundStatus != ''" >
 				refundStatus = #{refundStatus},
 			</if>
@@ -386,9 +369,6 @@
 			<if test="outStoreTimes != null and outStoreTimes != ''" >
 				outStoreTimes = #{outStoreTimes},
 			</if>
-            <if test="discountFee != null and discountFee != ''" >
-                discountFee = #{discountFee},
-            </if>
 			<if test="splitFlag != null and splitFlag != ''" >
 				splitFlag = #{splitFlag},
 			</if>
@@ -476,16 +456,6 @@
 		DELETE FROM cm_shop_order WHERE shopOrderID = #{shopOrderID}
 	</delete>
 
-	<update id="updateStatusByOrderID">
-		update cm_shop_order set
-		status = #{status} where orderID = #{orderID}
-	</update>
-
-	<update id="updateStatusByShopOrderID">
-		update cm_shop_order set
-		status = #{status} where shopOrderID = #{shopOrderID}
-	</update>
-
 	<insert id="shopOrderBak" parameterType="NewShopOrder"  keyProperty="shopOrderBakID" useGeneratedKeys="true">
 		INSERT INTO cm_shop_order_bak(
 			orderID,
@@ -496,14 +466,12 @@
 			itemCount,
 			townID,
 			productAmount,
-			fee,
 			discountAmount,
 			accountAmount,
 			totalAmount,
 			payFlag,
 			payTime,
 			finishTime,
-			status,
 			refundStatus,
 			needPayAmount,
 			canRefundAmount,
@@ -539,14 +507,12 @@
 			#{itemCount},
 			#{townID},
 			#{productAmount},
-			#{fee},
 			#{discountAmount},
 			#{accountAmount},
 			#{totalAmount},
 			#{payFlag},
 			#{payTime},
 			#{finishTime},
-			#{status},
 			#{refundStatus},
 			#{needPayAmount},
 			#{canRefundAmount},
@@ -619,9 +585,6 @@
 			<if test="productAmount != null and productAmount != ''" >
 				productAmount = #{productAmount},
 			</if>
-			<if test="fee != null and fee != ''" >
-				fee = #{fee},
-			</if>
 			<if test="discountAmount != null and discountAmount != ''" >
 				discountAmount = #{discountAmount},
 			</if>
@@ -640,9 +603,6 @@
 			<if test="finishTime != null and finishTime != ''" >
 				finishTime = #{finishTime},
 			</if>
-			<if test="status != null and status != ''" >
-				status = #{status},
-			</if>
 			<if test="refundStatus != null and refundStatus != ''" >
 				refundStatus = #{refundStatus},
 			</if>
@@ -727,9 +687,6 @@
 			<if test="outStoreTimes != null and outStoreTimes != ''" >
 				outStoreTimes = #{outStoreTimes},
 			</if>
-			<if test="discountFee != null and discountFee != ''" >
-				discountFee = #{discountFee},
-			</if>
 			<if test="splitFlag != null and splitFlag != ''" >
 				splitFlag = #{splitFlag},
 			</if>

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

@@ -15,7 +15,6 @@
 		a.fee as "fee",
 		a.note as "note",
 		a.status as "status",
-		a.commentFlag as "commentFlag",
 		a.normalPrice as "normalPrice",
 		a.price0 as "price0",
 		a.price1 as "price1",
@@ -102,7 +101,6 @@
 		fee = #{fee},
 		note = #{note},
 		status = #{status},
-		commentFlag = #{commentFlag},
 		normalPrice = #{normalPrice},
 		price0 = #{price0},
 		price1 = #{price1},

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -4,44 +4,44 @@
 
 	<sql id="newCmClubColumns">
 		a.clubID AS "clubID",
-			a.userID AS "userID",
-			u.name AS "name",
-			a.sname AS "sname",
-			a.logo AS "logo",
-			a.legalPerson AS "legalPerson",
-			a.provinceID AS "provinceID",
-			a.cityID AS "cityID",
-			a.townID AS "townID",
-			a.flag AS "flag",
-			a.inviterBindID AS "inviterBindID",
-			a.inviterName AS "inviterName",
-			a.spID AS "spID",
-			a.mainServiceProviderID AS "mainServiceProviderID",
-			a.scanTime AS "scanTime",
-			a.address AS "address",
-			a.linkMan AS "linkMan",
-			a.linkManIdentity AS "linkManIdentity",
-			a.contractPhone AS "contractPhone",
-			a.contractMobile AS "contractMobile",
-			a.contractEmail AS "contractEmail",
-			a.fax AS "fax",
-			a.info AS "info",
-			a.addTime AS "addTime",
-			a.auditTime AS "auditTime",
-			a.auditNote AS "auditNote",
-			a.status AS "status",
-			a.businessLicenseImage AS "businessLicenseImage",
-			a.defaultServiceProviderID AS "defaultServiceProviderID",
-			a.defaultServiceProviderUpdTime AS "defaultServiceProviderUpdTime",
-			a.mainpro AS "mainpro",
-			a.scanFlag AS "scanFlag",
-			a.headpic AS "headpic",
-			a.socialCreditCode AS "socialCreditCode",
-			a.lastModify AS "lastModify",
-			a.firstClubType AS "firstClubType",
-			a.secondClubType AS "secondClubType",
-			a.department AS "department",
-			a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg"
+		a.userID AS "userID",
+		u.name AS "name",
+		a.sname AS "sname",
+		a.logo AS "logo",
+		a.legalPerson AS "legalPerson",
+		a.provinceID AS "provinceID",
+		a.cityID AS "cityID",
+		a.townID AS "townID",
+		a.flag AS "flag",
+		a.inviterBindID AS "inviterBindID",
+		a.inviterName AS "inviterName",
+		a.spID AS "spID",
+		a.mainServiceProviderID AS "mainServiceProviderID",
+		a.scanTime AS "scanTime",
+		a.address AS "address",
+		a.linkMan AS "linkMan",
+		a.linkManIdentity AS "linkManIdentity",
+		a.contractPhone AS "contractPhone",
+		a.contractMobile AS "contractMobile",
+		a.contractEmail AS "contractEmail",
+		a.fax AS "fax",
+		a.info AS "info",
+		a.addTime AS "addTime",
+		a.auditTime AS "auditTime",
+		a.auditNote AS "auditNote",
+		a.status AS "status",
+		a.businessLicenseImage AS "businessLicenseImage",
+		a.defaultServiceProviderID AS "defaultServiceProviderID",
+		a.defaultServiceProviderUpdTime AS "defaultServiceProviderUpdTime",
+		a.mainpro AS "mainpro",
+		a.scanFlag AS "scanFlag",
+		a.headpic AS "headpic",
+		a.socialCreditCode AS "socialCreditCode",
+		a.lastModify AS "lastModify",
+		a.firstClubType AS "firstClubType",
+		a.secondClubType AS "secondClubType",
+		a.department AS "department",
+		a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg"
 	</sql>
 
 	<sql id="otherColumns">