卖家优惠券

@@ -38,6 +38,8 @@ public class SellerOrder implements Serializable {
     
     private Integer updateTime;//更新时间
     
+    private BigDecimal couponCutAmount; //平台给卖家优惠券
+    
 	public Integer getId() {
 		return id;
 	}
@@ -126,6 +128,14 @@ public class SellerOrder implements Serializable {
 		this.updateTime = updateTime;
 	}
 
+	public BigDecimal getCouponCutAmount() {
+		return couponCutAmount;
+	}
+
+	public void setCouponCutAmount(BigDecimal couponCutAmount) {
+		this.couponCutAmount = couponCutAmount;
+	}
+
 	@Override
     public String toString() {
         return "Brand{" +
@@ -140,6 +150,7 @@ public class SellerOrder implements Serializable {
                 ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
+                ", couponCutAmount=" + couponCutAmount +
                 '}';
     }
 }

@@ -10,13 +10,14 @@
       <result column="payment" property="payment" jdbcType="TINYINT" />
       <result column="income" property="income" jdbcType="DECIMAL" />
       <result column="earnest_money" property="earnestMoney" jdbcType="DECIMAL" />
+      <result column="coupon_cut_amount" property="couponCutAmount" jdbcType="DECIMAL" />
       <result column="status" property="status" jdbcType="TINYINT" />
       <result column="create_time" property="createTime" jdbcType="INTEGER" />
       <result column="update_time" property="updateTime" jdbcType="INTEGER" />
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, uid, order_code, skup, client_type, payment, income, earnest_money,
+        id, uid, order_code, skup, client_type, payment, income, earnest_money, coupon_cut_amount, 
         status, create_time, update_time
     </sql>
 

@@ -2864,6 +2864,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 		resp.setActivityCutAmount(goods.getActivityCutAmount() == null ? "-" : String.format("%.2f", goods.getActivityCutAmount().doubleValue()));
 		resp.setTariffAmount(buyerOrderGoodsService.getTariffAmount(goods));
         resp.setCutPromotionAmount(buyerOrderGoodsService.getCutPromotionAmountStr(goods));
+        SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
+        resp.setSellerCouponCutAmount(sellerOrder.getCouponCutAmount() == null ? "0.00" : String.format("%.2f", sellerOrder.getCouponCutAmount().doubleValue()));
 		SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
     	if(sellerMeta!=null){
 			JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());

@@ -154,8 +154,9 @@
                   <tr>
                       <th colspan="2">销售价：<span id="salesPrice"></span></th>
                       <th colspan="2">平台费用：<span id="platformFee"></span></th>
-                      <th colspan="3">银行转账费用：<span id="bankTransferfee"></span></th>
-                      <th colspan="3">卖家实际收入：<span id="sellerIncome"></span></th>
+                      <th colspan="1">银行转账费用：<span id="bankTransferfee"></span></th>
+                      <th colspan="3">优惠券：<span id="sellerCouponCutAmount"></span></th>
+                      <th colspan="10">卖家实际收入：<span id="sellerIncome"></span></th>
                   </tr>
               </table>