Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/ufo-platform into test6.9.5

@@ -25,6 +25,8 @@ public class BuyerOrderGoods implements Serializable {
     private BigDecimal goodsAmount;//成交价
     
     private BigDecimal couponCutAmount;//优惠金额
+
+	private BigDecimal activityCutAmount;//活动优惠金额
     
 	public Integer getId() {
 		return id;
@@ -82,6 +84,14 @@ public class BuyerOrderGoods implements Serializable {
 		this.couponCutAmount = couponCutAmount;
 	}
 
+	public BigDecimal getActivityCutAmount() {
+		return activityCutAmount;
+	}
+
+	public void setActivityCutAmount(BigDecimal activityCutAmount) {
+		this.activityCutAmount = activityCutAmount;
+	}
+
 	@Override
     public String toString() {
         return "BuyerOrderGoods{" +

@@ -9,10 +9,11 @@
       <result column="goods_price" property="goodsPrice" jdbcType="DECIMAL" />
       <result column="goods_amount" property="goodsAmount" jdbcType="DECIMAL" />
       <result column="coupon_cut_amount" property="couponCutAmount" jdbcType="DECIMAL" />
+      <result column="activity_cut_amount" property="activityCutAmount" jdbcType="DECIMAL" />
     </resultMap>
     
     <sql id="Base_Column_List">
-        id, uid, order_code, skup, goods_price, goods_amount, coupon_cut_amount
+        id, uid, order_code, skup, goods_price, goods_amount, coupon_cut_amount,activity_cut_amount
     </sql>
 
     <select id="selectById" resultMap="BaseResultMap">

@@ -1621,7 +1621,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	resp.setSellerUid(buyerOrder.getSellerUid());
     	resp.setSellerName(getUserNameByUid(buyerOrder.getSellerUid()));
     	resp.setSellerMobile(getMobileByUid(buyerOrder.getSellerUid()));
-    	SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
+		resp.setActivityCutAmount(goods.getActivityCutAmount() == null ? "0" : String.format("%.2f", goods.getActivityCutAmount().toString()));
+		SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
     	if(sellerMeta!=null){
 			JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());
 			resp.setSellerRebackAddressDetail(sellerMetaValue.getString("address"));

@@ -101,6 +101,7 @@
                       <th>颜色</th>
                       <th>尺码</th>
                       <th>销售价</th>
+                      <th>活动优惠</th>
                       <th>优惠券</th>
                       <th>购买数量</th>
                       <th>运费</th>
@@ -116,6 +117,7 @@
                       <td><span id="colorName"></span></td>
                       <td><span id="sizeName"></span></td>
                       <td><span id="goodsPrice"></span></td>
+                      <td><span id="activityCutAmount"></span></td>
                       <td><span id="couponCutAmount"></span></td>
                       <td><span id="productNum"></span></td>
                       <td><span id="shipFee"></span></td>