页面新增导出销售报表按钮

kmall-admin/src/main/java/com/kmall/admin/controller/ExportExcelController.java

@@ -7,6 +7,7 @@ import com.kmall.admin.service.OrderService;
 import com.kmall.admin.service.SalesDataUploadService;
 import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.constant.Dict;
+import com.kmall.common.utils.DateUtils;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.excel.ExcelExport;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +32,8 @@ import java.util.*;
 @RestController
 @RequestMapping("exportExcel")
 public class ExportExcelController {
-
+    private static String  ISO = "iso-8859-1";
+    private static String  UTF = "utf-8";
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportExcelController.class);
 
     @Autowired
@@ -46,8 +48,15 @@ public class ExportExcelController {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
 
         // 账单日期
-        String billDate = (String) params.get("startTime");
+        String billDate = (String) params.get("billDate");
+        params = ParamUtils.setTimeMap(params);
 
+        try {
+            billDate = new String(billDate.getBytes(ISO), UTF);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        billDate = DateUtils.getDate(billDate);
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date sDate = sdf.parse(billDate);
@@ -60,7 +69,7 @@ public class ExportExcelController {
         String summaryDate = sdf.format(sDate);
 
 
-        params = ParamUtils.setTimeMap(params);
+
         params.put("isOnfiilineOrder", Dict.isOnfflineOrder.item_1.getItem());
 
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2236,7 +2236,7 @@
         left join mall_sale_record record on record.order_sn = o.order_sn
         LEFT JOIN sys_user u ON record.saller_id = u.user_id
         WHERE
-        (DATE_FORMAT(o.create_time,'%Y-%m-%d') != #{billDate})
+        (DATE_FORMAT(o.create_time,'%Y-%m-%d') = #{billDate})
         <if test="storeId != ''">
             and o.store_id = #{storeId}
         </if>

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

@@ -46,6 +46,12 @@
                 #end
                 <i-button type="primary" @click="exportSystemFormat"><i class="fa fa-cloud-download"></i>&nbsp;Daily sales report 导出</i-button>
             </div>
+            <div>
+                <i-col span="3">
+                    <Date-picker v-model="q.billDate" placeholder="账单时间"/>
+                </i-col>
+                <i-button type="primary" @click="exportSaleReportExcel"><i class="fa fa-cloud-download"></i>&nbsp;销售报表导出</i-button>
+            </div>
            <!-- TODO req_hidden_20200610 #if($shiro.hasPermission("order:wxMicropayPay"))
             <div class="buttons-group">
                 <i-button type="error" @click="showInputAuthCode">微信付款</i-button>
@@ -206,8 +212,8 @@
                         </td>
                         <td align="center">￥{{item.number * item.marketPrice}}</td>
                         <td align="center">￥{{item.number * item.discountedPrice}}</td>
-                        <td align="center">￥{{item.number * item.actualPaymentAmount}}</td>
-                        <td align="center">￥{{item.number * item.actualPaymentAmount}}</td>
+                        <td align="center">￥{{item.actualPaymentAmount}}</td>
+                        <td align="center">￥{{item.actualPaymentAmount}}</td>
                         <td align="center">￥{{item.tax}}</td>
                     </tr>
                     <tr>

kmall-admin/src/main/webapp/js/shop/offilineOrderList.js

@@ -195,6 +195,7 @@ let vm = new Vue({
             startTime: '',
             endTime: '',
             goodsSn:'',
+            billDate:'',
         },
         refundMoney: 0,
         shipping: {},
@@ -252,6 +253,7 @@ let vm = new Vue({
                     'startTime': vm.q.startTime,
                     'endTime': vm.q.endTime,
                     'goodsSn':vm.q.goodsSn,
+                    'billDate':vm.q.billDate,
                 },
                 page: page
             }).trigger("reloadGrid");
@@ -261,7 +263,10 @@ let vm = new Vue({
                 orderSn: '',
                 orderStatus: '',
                 orderType: '',
-                goodsSn:''
+                goodsSn:'',
+                billDate:'',
+                startTime:'',
+                endTime:'',
             };
         },
         lookDetail: function (rowId) { //第三步：定义编辑操作
@@ -515,6 +520,12 @@ let vm = new Vue({
             params.startTime=vm.q.startTime;
             params.endTime=vm.q.endTime;
             exportFile('#rrapp', '../order/exportSystemFormat', params);
+        },
+        exportSaleReportExcel:function(){
+            var params = {};
+            params.billDate = vm.q.billDate;
+            exportFile('#rrapp', '../exportExcel/exportSalesExcel', params);
+
         }
     },
     created: function () {