1.取货码带收银机编号,小票打印一张

2.调整销售管理数据

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

@@ -2112,6 +2112,7 @@ public class OrderServiceImpl implements OrderService {
             // 生成取票码
             PickUpCodeEntity pickUpCodeEntity = new PickUpCodeEntity();
             pickUpCodeEntity.setOrderSn(order.getOrder_sn());
+            pickUpCodeEntity.setPickUpCodeSn(cashierEntity.getCashierSn());//取货码前段
             pickUpCodeService.save(pickUpCodeEntity);
 
             resultObj.put("code",pickUpCodeEntity.getPickUpCodeSn()); // 系统中累加

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

@@ -5,6 +5,7 @@ import com.kmall.admin.entity.PickUpCodeEntity;
 import com.kmall.admin.service.PickUpCodeService;
 import com.kmall.admin.utils.ShiroUtils;
 import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,7 +62,11 @@ public class PickUpCodeServiceImpl implements PickUpCodeService {
         //生成一个 5 位的随机字符串
         String randomCode = RandomStringUtils.randomAlphanumeric(5).toUpperCase();
         //K： 跨境电商 ， Y：一般贸易
-        pickUpCode.setPickUpCodeSn(pickUpCodeSn);
+        if(StringUtils.isNotEmpty(pickUpCode.getPickUpCodeSn())){
+            pickUpCode.setPickUpCodeSn(pickUpCode.getPickUpCodeSn()+"-"+pickUpCodeSn);
+        }else{
+            pickUpCode.setPickUpCodeSn(pickUpCodeSn);
+        }
         //  pickUpCode.setPickUpCodeSn("Y-");
         pickUpCode.setPickUpCodeStatus("0");
         if (pickUpCode.getPickUpCodeCreatetime()==null){

kmall-admin/src/main/resources/mybatis/mapper/statistics/MonthlyCustomersDao.xml

@@ -184,7 +184,7 @@
 		SELECT
 			sum( og.number ) AS sales,
 			cg.NAME AS cgname,
-			sum( o.order_price ) AS totalSales,
+			sum(  og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price)AS totalSales,
 			DATE_FORMAT(o.pay_time,'%Y-%m') as yearAndMonth
 		FROM
 			mall_order o

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

@@ -568,7 +568,7 @@ let vm = new Vue({
         parCode : "",
 
         // 总件数
-        totalCount:0,
+        totalCount:0
 
     },
     methods: {
@@ -1122,7 +1122,12 @@ function printArea(content) {
         + '</div>');
     doc.close();
     var frameWindow = iframe.contentWindow;
-    if(!vm.firstPrint){
+
+    frameWindow.focus();
+    frameWindow.print();
+    frameWindow.print();
+    alert('打印小票完成');
+    /*if(!vm.firstPrint){
         setTimeout(function() {
             // frameWindow.close();
             frameWindow.focus();
@@ -1137,8 +1142,7 @@ function printArea(content) {
         frameWindow.print();
         frameWindow.print();
         alert('打印小票完成');
-    }
-
+    }*/
 }
 
 function printArea2(content) {