ufo / ufo-platform · Commits

Go to a project

Authored by Lixiaodi
Commit 7370c28afa6153528f579e6b8868dc59ac52b20e 1 parent 4402e6a5

增加订单页展示字段

Inline Side-by-side
Showing 4 changed files with 16 additions and 2 deletions
@@ -25,6 +25,8 @@ public class BuyerOrderGoods implements Serializable { @@ -25,6 +25,8 @@ public class BuyerOrderGoods implements Serializable {
25 private BigDecimal goodsAmount;//成交价 25 private BigDecimal goodsAmount;//成交价
26 26
27 private BigDecimal couponCutAmount;//优惠金额 27 private BigDecimal couponCutAmount;//优惠金额
  28 +
  29 + private BigDecimal activityCutAmount;//活动优惠金额
28 30
29 public Integer getId() { 31 public Integer getId() {
30 return id; 32 return id;
@@ -82,6 +84,14 @@ public class BuyerOrderGoods implements Serializable { @@ -82,6 +84,14 @@ public class BuyerOrderGoods implements Serializable {
82 this.couponCutAmount = couponCutAmount; 84 this.couponCutAmount = couponCutAmount;
83 } 85 }
84 86
  87 + public BigDecimal getActivityCutAmount() {
  88 + return activityCutAmount;
  89 + }
  90 +
  91 + public void setActivityCutAmount(BigDecimal activityCutAmount) {
  92 + this.activityCutAmount = activityCutAmount;
  93 + }
  94 +
85 @Override 95 @Override
86 public String toString() { 96 public String toString() {
87 return "BuyerOrderGoods{" + 97 return "BuyerOrderGoods{" +
@@ -9,10 +9,11 @@ @@ -9,10 +9,11 @@
9 <result column="goods_price" property="goodsPrice" jdbcType="DECIMAL" /> 9 <result column="goods_price" property="goodsPrice" jdbcType="DECIMAL" />
10 <result column="goods_amount" property="goodsAmount" jdbcType="DECIMAL" /> 10 <result column="goods_amount" property="goodsAmount" jdbcType="DECIMAL" />
11 <result column="coupon_cut_amount" property="couponCutAmount" jdbcType="DECIMAL" /> 11 <result column="coupon_cut_amount" property="couponCutAmount" jdbcType="DECIMAL" />
  12 + <result column="activity_cut_amount" property="activityCutAmount" jdbcType="DECIMAL" />
12 </resultMap> 13 </resultMap>
13 14
14 <sql id="Base_Column_List"> 15 <sql id="Base_Column_List">
15 - id, uid, order_code, skup, goods_price, goods_amount, coupon_cut_amount 16 + id, uid, order_code, skup, goods_price, goods_amount, coupon_cut_amount,activity_cut_amount
16 </sql> 17 </sql>
17 18
18 <select id="selectById" resultMap="BaseResultMap"> 19 <select id="selectById" resultMap="BaseResultMap">
@@ -1621,7 +1621,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1621,7 +1621,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1621 resp.setSellerUid(buyerOrder.getSellerUid()); 1621 resp.setSellerUid(buyerOrder.getSellerUid());
1622 resp.setSellerName(getUserNameByUid(buyerOrder.getSellerUid())); 1622 resp.setSellerName(getUserNameByUid(buyerOrder.getSellerUid()));
1623 resp.setSellerMobile(getMobileByUid(buyerOrder.getSellerUid())); 1623 resp.setSellerMobile(getMobileByUid(buyerOrder.getSellerUid()));
1624 - SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS); 1624 + resp.setActivityCutAmount(goods.getActivityCutAmount() == null ? "0" : String.format("%.2f", goods.getActivityCutAmount().toString()));
  1625 + SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
1625 if(sellerMeta!=null){ 1626 if(sellerMeta!=null){
1626 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue()); 1627 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());
1627 resp.setSellerRebackAddressDetail(sellerMetaValue.getString("address")); 1628 resp.setSellerRebackAddressDetail(sellerMetaValue.getString("address"));
@@ -101,6 +101,7 @@ @@ -101,6 +101,7 @@
101 <th>颜色</th> 101 <th>颜色</th>
102 <th>尺码</th> 102 <th>尺码</th>
103 <th>销售价</th> 103 <th>销售价</th>
  104 + <th>活动优惠</th>
104 <th>优惠券</th> 105 <th>优惠券</th>
105 <th>购买数量</th> 106 <th>购买数量</th>
106 <th>运费</th> 107 <th>运费</th>
@@ -116,6 +117,7 @@ @@ -116,6 +117,7 @@
116 <td><span id="colorName"></span></td> 117 <td><span id="colorName"></span></td>
117 <td><span id="sizeName"></span></td> 118 <td><span id="sizeName"></span></td>
118 <td><span id="goodsPrice"></span></td> 119 <td><span id="goodsPrice"></span></td>
  120 + <td><span id="activityCutAmount"></span></td>
119 <td><span id="couponCutAmount"></span></td> 121 <td><span id="couponCutAmount"></span></td>
120 <td><span id="productNum"></span></td> 122 <td><span id="productNum"></span></td>
121 <td><span id="shipFee"></span></td> 123 <td><span id="shipFee"></span></td>