Merge branch 'master' of wangchaoqun/kmall-haikong into master

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -178,7 +178,8 @@
                             <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
                                 <th style="width: 300px;padding: 7px">跨境商品名称</th>
                                 <th style="padding: 7px">单价</th>
-                                <th style="padding: 7px">优惠金额</th>
+                                <th style="padding: 7px">积分优惠</th>
+                                <th style="padding: 7px">其他优惠</th>
                                 <th style="padding: 7px">预估税费</th>
                                 <th style="padding: 7px">实际支付价</th>
                                 <th style="padding: 7px">数量</th>
@@ -188,7 +189,8 @@
                             <tr v-for="(item,i) in goodsList" v-if="item.name" style="font-size: 1.3em">
                                 <td><h3>{{item.name}}</h3></td>
                                 <td> {{item.retailPrice}}</td>
-                                <td> {{item.discountedPrice}}</td>
+                                <td> {{item.deductionPrice}}</td>
+                                <td> {{item.discountedPrice - item.deductionPrice}}</td>
                                 <td> {{item.goodstaxes}}</td>
                                 <td> {{item.actualPaymentAmount}}</td>
                                 <td>

kmall-admin/src/main/webapp/WEB-INF/page/shop/offilineOrderList.html

@@ -199,7 +199,8 @@
                     <tr>
                         <td style="text-align: left; width: 600px; font-weight: bold;" colspan="2">商品</td>
                         <td style="text-align: center; width: 240px; font-weight: bold;">小计</td>
-                        <td style="text-align: center; width: 240px; font-weight: bold;">优惠抵扣金额（元）</td>
+                        <td style="text-align: center; width: 240px; font-weight: bold;">积分抵扣金额（元）</td>
+                        <td style="text-align: center; width: 240px; font-weight: bold;">其他优惠金额（元）</td>
                         <td style="text-align: center; width: 240px; font-weight: bold;">应收金额（元）</td>
                         <td style="text-align: center; width: 240px; font-weight: bold;">实收金额（元）</td>
                         <td style="text-align: center; width: 240px; font-weight: bold;">预估税额（元）</td>
@@ -215,7 +216,8 @@
                             <p style="line-height: 30px;">SKU：{{item.sku}}</p>
                         </td>
                         <td align="center">￥{{item.number * item.marketPrice}}</td>
-                        <td align="center">￥{{item.discountedPrice}}</td>
+                        <td align="center">￥{{item.deductionPrice}}</td>
+                        <td align="center">￥{{item.discountedPrice - item.deductionPrice}}</td>
                         <td align="center">￥{{item.actualPaymentAmount}}</td>
                         <td align="center">￥{{item.actualPaymentAmount}}</td>
                         <td align="center">￥{{item.tax}}</td>