Merge remote-tracking branch 'upsteam/master'

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4317,15 +4317,15 @@ public class OrderServiceImpl implements OrderService {
             // 清空上一次计算活动价格的相关信息
             BigDecimal deductionPrice = good.getDeductionPrice();
             if (Objects.nonNull(deductionPrice)) {
-                good.setDeductionPrice(null);
+                good.setDeductionPrice(BigDecimal.ZERO);
             }
             Integer deductionScore = good.getDeductionScore();
             if (Objects.nonNull(deductionScore)) {
-                good.setDeductionScore(null);
+                good.setDeductionScore(0);
             }
             BigDecimal discountedPrice = good.getDiscountedPrice();
             if (Objects.nonNull(discountedPrice)) {
-                good.setDiscountedPrice(null);
+                good.setDiscountedPrice(BigDecimal.ZERO);
             }
             String activity = good.getActivity();
             if (Objects.nonNull(activity)) {

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

@@ -53,7 +53,10 @@
             </Form-item>
             <Form-item label="是否参与积分抵扣" prop="reject">
                 <p>只能有一种情况，如果积分抵扣商品中都为0，则默认这些商品为参与，其余商品不参与，如果积分抵扣商品都为1，其余商品都参与</p>
-                <i-input v-model="mkActivitiesScore.reject" placeholder="0：参与，1：不参与"/>
+                <i-select v-model="mkActivitiesScore.reject" placeholder="0：参与，1：不参与" style="width: 268px;">
+                    <i-option value="0" >参与</i-option>
+                    <i-option value="1" >不参与</i-option>
+                </i-select>
             </Form-item>
             <!--<Form-item label="抵扣比例" prop="scoreLimit">
                 <i-input v-model="mkActivitiesScore.scoreLimit" placeholder="抵扣比例"/>

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

@@ -206,6 +206,15 @@
                         </table>
                     </li>
                     <li>
+                        <div style="margin-bottom: 10PX">
+                            <h3 style="border: white;padding: 8px">会员手机号：{{userInfo.customPhone}}</h3>
+                        </div>
+                        <ul style="display: inline-block">
+                            <li><h3 style="border: white;padding: 8px;">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
+                            <li><h3 style="border: white;padding: 8px;">抵扣积分:{{deductionScore}}</h3></li>
+                            <li><h3 style="border: white;padding: 8px;">会员等级:{{levelName}}</h3></li>
+                        </ul>
+                        <div style="width: 30px; display: inline-block"></div>
                         <ul style="display: inline-block">
                             <li><h3 style="border: white;padding: 8px;">总件数:{{totalCount}}</h3></li>
                             <li><h3 style="border: white;padding: 8px;">总价:{{totalPrice}}</h3></li>
@@ -213,12 +222,6 @@
                             <li><h3 style="border: white;padding: 8px">实际支付价:{{actualPrice}}</h3></li>
                             <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px">满减:{{showReduceMoney}}</h3></li>
                         </ul>
-                        <div style="width: 30px; display: inline-block"></div>
-                        <ul style="display: inline-block">
-                            <li><h3 style="border: white;padding: 8px;">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px;">抵扣积分:{{deductionScore}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px;">会员等级:{{levelName}}</h3></li>
-                        </ul>
                     </li>
                     <li  style="height: 100px;">
                         <i-button type="error" @click="clearGoodsList" class="goods-button"><i class="fa fa-pencil-square-o"></i>&nbsp;清空</i-button>
@@ -372,17 +375,20 @@
                                         <h4 class="modal-title" id="payModalLabel">付款码</h4>
                                     </div>
                                     <div class="modal-body">
-                                        <div style="margin-bottom: 50px">
-                                            <ul style="display: inline-block">
-                                                <li><h3 style="border: white;padding: 8px;">总件数:{{totalCount}}</h3></li>
-                                                <li><h3 style="border: white;padding: 8px;">总价:{{totalPrice}}</h3></li>
-                                                <li><h3 style="border: white;padding: 8px;color: red;">实际支付价:{{actualPrice}}</h3></li>
-                                            </ul>
+                                        <div style="margin-bottom: 10PX">
+                                            <h3 style="border: white;padding: 8px">会员手机号：{{userInfo.customPhone}}</h3>
+                                        </div>
+                                        <div style="margin-bottom: 30px">
                                             <ul style="display: inline-block">
                                                 <li><h3 style="border: white;padding: 8px">会员等级:{{levelName}}</h3></li>
                                                 <li><h3 style="border: white;padding: 8px">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
                                                 <li><h3 style="border: white;padding: 8px">抵扣积分:{{deductionScore}}</h3></li>
                                             </ul>
+                                            <ul style="display: inline-block">
+                                                <li><h3 style="border: white;padding: 8px;">总件数:{{totalCount}}</h3></li>
+                                                <li><h3 style="border: white;padding: 8px;">总价:{{totalPrice}}</h3></li>
+                                                <li><h3 style="border: white;padding: 8px;color: red;">实际支付价:{{actualPrice}}</h3></li>
+                                            </ul>
                                         </div>
                                         <form>
                                             <div class="form-group">

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -604,7 +604,7 @@ let vm = new Vue({
         // 会员手机
         memberPhone: '',
         // 订单抵扣积分
-        deductionScore: '',
+        deductionScore: '无',
         // 会员可用积分
         memberCurrentAvailableScore: 0,
         // 会员等级名称
@@ -1425,6 +1425,14 @@ let vm = new Vue({
                 alert("请输入身份证");
                 return;
             }
+
+            let memberCode = vm.memberCode;
+            if (memberCode === null || memberCode === '' || memberCode === 'undefined') {
+                vm.levelName = '无';
+                vm.memberCurrentAvailableScore = '无';
+                vm.deductionScore = '无';
+            }
+
             $.ajax({
                 type: "POST",
                 url: "../api/index/idCardVerification",

kmall-common/pom.xml

@@ -45,6 +45,12 @@
             <groupId>com.qcloud</groupId>
             <artifactId>cos_api</artifactId>
             <version>${qcloud-cos-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- httpclient -->