Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong

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

@@ -4374,6 +4374,7 @@ public class OrderServiceImpl implements OrderService {
      */
     @Override
     public CalculateOrderDiscountPriceResponseVO calculateOrderDiscountPrice(CalculateOrderDiscountPriceVO calculateOrderDiscountPriceVo) {
+        LOGGER.debug("计算活动优惠价格，请求参数为{}",calculateOrderDiscountPriceVo);
         if (Objects.isNull(calculateOrderDiscountPriceVo)) {
             LOGGER.error("计算活动优惠价格，请求参数为null！");
             throw new ServiceException("计算活动优惠价格，请求参数为null！");
@@ -4404,7 +4405,7 @@ public class OrderServiceImpl implements OrderService {
                 good.setActivity(null);
             }
             BigDecimal actualPaymentAmount = good.getActualPaymentAmount().multiply(BigDecimal.valueOf(good.getSellVolume()));
-            good.setActualPaymentAmount(good.getRetailPrice());
+            good.setActualPaymentAmount(good.getRetailPrice().multiply(BigDecimal.valueOf(good.getSellVolume())));
 
             QueryGoodsVO queryGoodsVo = new QueryGoodsVO();
             BeanUtils.copyProperties(good, queryGoodsVo);
@@ -4819,8 +4820,7 @@ public class OrderServiceImpl implements OrderService {
         calculateOrderDiscountPriceResponseVO.setGoodsDetailsDtos(goodsDetailsDtos);
         orderTotalPrice = BigDecimal.ZERO;
         for (GoodsDetailsDto goodsDetailsDto : goodsDetailsDtos) {
-            orderTotalPrice = orderTotalPrice.add(goodsDetailsDto.getActualPaymentAmount()
-                    .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume())));
+            orderTotalPrice = orderTotalPrice.add(goodsDetailsDto.getActualPaymentAmount());
         }
         calculateOrderDiscountPriceResponseVO.setOrderTotalPrice(orderTotalPrice);
         return calculateOrderDiscountPriceResponseVO;
@@ -4897,14 +4897,12 @@ public class OrderServiceImpl implements OrderService {
             if (!promotionSkuList.contains(sku)) {
                 if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
                     if (scoreDeductionAllowSkuList.contains(sku)) {
-                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
-                                .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
                         skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
                     }
                 } else if (CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && !CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
                     if (!scoreDeductionRejectSkuList.contains(sku)) {
-                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
-                                .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
                         skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
                     }
                 }
@@ -4978,8 +4976,7 @@ public class OrderServiceImpl implements OrderService {
                     String sku = goodsDetailsDto.getGoodsSn();
                     String prodBarcode = goodsDetailsDto.getProdBarcode();
                     // 此字段 = 零售价 - 其他活动优惠金额
-                    BigDecimal actualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
-                            .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));// 商品金额乘以数量
+                    BigDecimal actualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();// 商品金额
                     // 当前商品最大支持抵扣的金额
                     BigDecimal currentSkuMaxDeductionPrice = actualPaymentAmount.multiply(scoreRatio).setScale(0, BigDecimal.ROUND_FLOOR);
                     // 其他活动优惠金额

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

@@ -22,10 +22,10 @@
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
-            <div class="small-box bg-yellow">
+            <div class="small-box bg-green">
                 <div class="inner">
-                    <h3>{{dfOrderSum}}</h3>
-                    <p>待发货</p>
+                    <h3>{{yfOrderSum}}</h3>
+                    <p>已发货</p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
@@ -36,10 +36,10 @@
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
-            <div class="small-box bg-green">
+            <div class="small-box bg-fuchsia">
                 <div class="inner">
-                    <h3>{{yfOrderSum}}</h3>
-                    <p>已发货</p>
+                    <h3>{{thcOrderSum}}</h3>
+                    <p>退款订单</p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
@@ -49,6 +49,21 @@
                         class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
+        <div class="col-md-3 col-sm-6 col-xs-12">
+            <div class="small-box bg-yellow">
+                <div class="inner">
+                    <h3>{{dfOrderSum}}</h3>
+                    <p>已付款</p>
+                </div>
+                <div class="icon">
+                    <i class="fa fa-shopping-bag"></i>
+                </div>
+                <a class="small-box-footer"></a>
+                <a onclick="vm.toOrderByShipStatus(2)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
+            </div>
+        </div>
+
 <!--        <div class="col-md-3 col-sm-6 col-xs-12">-->
 <!--            <div class="small-box bg-light-blue">-->
 <!--                <div class="inner">-->
@@ -63,20 +78,6 @@
 <!--                        class="fa fa-arrow-circle-right"></i></a>-->
 <!--            </div>-->
 <!--        </div>-->
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            <div class="small-box bg-fuchsia">
-                <div class="inner">
-                    <h3>{{thcOrderSum}}</h3>
-                    <p>退款订单</p>
-                </div>
-                <div class="icon">
-                    <i class="fa fa-shopping-bag"></i>
-                </div>
-                <a class="small-box-footer"></a>
-                <a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
-            </div>
-        </div>
 <!--        <div class="col-md-3 col-sm-6 col-xs-12">-->
 <!--            <div class="small-box bg-aqua">-->
 <!--                <div class="inner">-->
@@ -165,7 +166,7 @@
         el: '#rrapp',
         data: {
             orderSum: 0,//所有订单
-            dfOrderSum: 0,//待发货
+            dfOrderSum: 0,//已付款  原是待发货   都是指的同一个字段（已付款，待发货）
             yfOrderSum: 0,//已发货
             yfkOrderSum: 0,//待付款
             ywcOrderSum: 0,//已完成
@@ -192,35 +193,40 @@
                     openWindow({
                         top: true,
                         type: 2,
-                        title: '订单',
-                        content: '../shop/order.html'
+                        title: '所有订单',
+                        content: '../shop/offilineOrderList.html'
                     });
                     return;
                 }
-                let url = '../shop/order.html?shippingStatus=' + shippingStatus;
-
-                if (shippingStatus == 0) {//待发货
-                    url += '&orderStatus=201&payStatus=2';
-                    if (vm.dfOrderSum == 0) {
+                let url = '../shop/offilineOrderList.html?orderType=1';
+                let title='';
+                if (shippingStatus == 0) {//已发货
+                    if (vm.yfOrderSum == 0) {
                         iview.Message.error('没有数据！');
                         return;
                     }
-                } else if (shippingStatus == 1) {//已发货
-                    if (vm.yfOrderSum == 0) {
+                    url+="&orderStatus=300"
+                    title="已发货"
+                } else if (shippingStatus == 1) {//退款订单
+                    if (vm.thcOrderSum == 0) {
                         iview.Message.error('没有数据！');
                         return;
                     }
-                } else if (shippingStatus == 4) {//退款
-                    if (vm.thcOrderSum == 0) {
+                    url+="&orderStatus=401"
+                    title="退款订单"
+                } else if (shippingStatus == 2){//已付款
+                    if (vm.dfOrderSum == 0) {
                         iview.Message.error('没有数据！');
                         return;
                     }
+                    url+="&orderStatus=201"
+                    title="已付款"
                 }
 
                 openWindow({
                     top: true,
                     type: 2,
-                    title: '订单',
+                    title: title,
                     content: url
                 });
             },
@@ -265,16 +271,16 @@
                 openWindow({
                     top: true,
                     type: 2,
-                    title: '会员列表',
+                    title: '消费记录总数',
                     area: ['90%', '95%'],
-                    content: '../shop/shopuser.html'
+                    content: '../cashier/salerecord.html'
                 });
             },
             toGoods: function () {
                 openWindow({
                     top: true,
                     type: 2,
-                    title: '商品',
+                    title: '所有商品',
                     content: '../shop/goods.html'
                 });
             }
@@ -302,53 +308,53 @@
             $.getJSON("../goods/queryTotal", function (r) {//所有商品数
                 vue.goodsSum = r.goodsSum;
             });
-            $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=1", function (r) {//待发货
+            $.getJSON("../order/queryTotal?orderStatus=201&isOnfiilineOrder=1&orderType=1", function (r) {//已付款
                 vue.dfOrderSum = r.sum;
-                if (r.sum > 0) {
-                    iview.Notice.info({
-                        title: '您有待发货订单',
-                        desc: '<a onclick="vm.toOrderByShipStatus(0)" class="small-box-footer">查看</a>',
-                        duration: 0
-                    });
-                    let iN = new iNotify({
-                        effect: 'flash',
-                        interval: 500,
-                        message: "待发订单",
-                        audio: {
-                            file: ['../statics/audio/dforder.mp3']
-                        },
-                        notification: {
-                            title: "通知！",
-                            body: '您有待发订单'
-                        }
-                    });
-                    iN.setTitle(true).player();
-                }
+                // if (r.sum > 0) {
+                //     iview.Notice.info({
+                //         title: '您有待发货订单',
+                //         desc: '<a onclick="vm.toOrderByShipStatus(0)" class="small-box-footer">查看</a>',
+                //         duration: 0
+                //     });
+                //     let iN = new iNotify({
+                //         effect: 'flash',
+                //         interval: 500,
+                //         message: "待发订单",
+                //         audio: {
+                //             file: ['../statics/audio/dforder.mp3']
+                //         },
+                //         notification: {
+                //             title: "通知！",
+                //             body: '您有待发订单'
+                //         }
+                //     });
+                //     iN.setTitle(true).player();
+                // }
             });
 
-            $.get("../orderrefund/queryTotal?isOnfflineOrder=1&refundStatus=1", function (r) {
-                // vue.thcOrderSum = r.sum;
-                if (r.sum > 0) {
-                    iview.Notice.info({
-                        title: '您有退款申请订单',
-                        desc: '<a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">查看</a>',
-                        duration: 0
-                    });
-                    let iN = new iNotify({
-                        effect: 'flash',
-                        interval: 500,
-                        message: "退款订单",
-                        audio: {
-                            file: ['../statics/audio/dforder.mp3']
-                        },
-                        notification: {
-                            title: "通知！",
-                            body: '您有退款申请订单'
-                        }
-                    });
-                    iN.setTitle(true).player();
-                }
-            });
+            // $.get("../orderrefund/queryTotal?isOnfflineOrder=1&refundStatus=1", function (r) {
+            //     // vue.thcOrderSum = r.sum;
+            //     if (r.sum > 0) {
+            //         iview.Notice.info({
+            //             title: '您有退款申请订单',
+            //             desc: '<a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">查看</a>',
+            //             duration: 0
+            //         });
+            //         let iN = new iNotify({
+            //             effect: 'flash',
+            //             interval: 500,
+            //             message: "退款订单",
+            //             audio: {
+            //                 file: ['../statics/audio/dforder.mp3']
+            //             },
+            //             notification: {
+            //                 title: "通知！",
+            //                 body: '您有退款申请订单'
+            //             }
+            //         });
+            //         iN.setTitle(true).player();
+            //     }
+            // });
 
             $.getJSON("../order/getUserOrderInfo?type=yfkOrderUserSum", function (r) {
                 vue.yfkOrderUserSum = r.result;