forked from beauty-erp
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -537,7 +537,7 @@ String title = "订单记录"; orderSheet.setSheetName(title); orderSheet.setTitle(title); String[] header = {"订单号", "客户姓名", "客户手机", "下单时间", "订单总价", "折后价", "现金付款", "卡付款", "顾问姓名", "所属门店", "订单状态"}; String[] header = {"订单号", "客户姓名", "客户手机", "下单时间", "订单总价", "折后价", "现金付款", "卡付款", "顾问姓名", "收银员", "所属门店", "订单状态"}; orderSheet.setHeaders(header); //门店只能查询本店自己的订单 List<SysOrder> dataList = orderService.findInPage(sysOrder, null); @@ -554,6 +554,7 @@ temp.add(item.getCashPay()); temp.add(item.getCardPay()); temp.add(item.getStaffName()); temp.add(item.getCashierName()); temp.add(item.getShopName()); temp.add(item.getStatu()); list.add(temp); zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -56,7 +56,12 @@ * 员工编号(美容顾问) 下单人id */ private Long staffId; /** * 收银员 */ private Long cashierId; /** * 商机id */ @@ -142,6 +147,10 @@ /* 会员手机号 */ private String vipPhone; /** * 收银员姓名 */ private String cashierName; private String staffName; @@ -200,6 +209,22 @@ */ private Integer isHasRefund; public String getCashierName() { return cashierName; } public void setCashierName(String cashierName) { this.cashierName = cashierName; } public Long getCashierId() { return cashierId; } public void setCashierId(Long cashierId) { this.cashierId = cashierId; } public Integer getIsHasRefund() { return isHasRefund; } zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -519,7 +519,12 @@ * @param pageOrder */ private void updateOrderInfo(SysOrder pageOrder) { SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); pageOrder.setCashierId(user.getSuId()); pageOrder.setPayTime(new Date()); pageOrder.setStatu(Dictionary.ORDER_STATU_YFK); List<SysOrderFlow> flows = pageOrder.getFlows();
@@ -14,6 +14,7 @@ <result property="orderNo" column="ORDER_NO"/> <result property="activity" column="ACTIVITY"/> <result property="total" column="TOTAL"/> <result property="cashierName" column="cashierName"/> <result property="statu" column="STATU"/> <result property="zkTotal" column="ZK_TOTAL"/> @@ -29,6 +30,7 @@ <result property="cardPay" column="card_Pay"/> <result property="arrears" column="arrears"/> <result property="payTime" column="pay_time"/> <result property="cashierId" column="cashier_id"/> <!-- 扩展字段 --> <result property="shopName" column="SHOP_NAME"/> @@ -64,7 +66,8 @@ pay_time, company_id, orderType, is_has_refund is_has_refund, cashier_id ) VALUES ( #{id}, @@ -88,7 +91,8 @@ #{payTime}, #{companyId}, #{orderType}, #{isHasRefund} #{isHasRefund}, #{cashierId} ) </insert> @@ -151,7 +155,9 @@ <if test="isHasRefund != null "> is_has_refund = #{isHasRefund}, </if> <if test="cashierId != null "> cashier_id = #{cashierId}, </if> </set> WHERE id=#{id} </update> @@ -174,11 +180,12 @@ <!-- 分页查询 --> <select id="selectInPage" resultMap="SysOrderMap"> select a.*, b.VIP_NAME, c.su_name as STAFF_NAME, a.*, b.VIP_NAME, c.su_name as STAFF_NAME, e.su_name as cashierName, d.SHOP_NAME, b.PHONE from sys_order a LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID left JOIN sys_users c on c.su_id=a.STAFF_ID left JOIN sys_users e on e.su_id=a.cashier_id left JOIN sys_shop_info d on d.ID=a.SHOP_ID where 1=1 <if test="record!=null"> @@ -208,6 +215,9 @@ </if> <if test="record.staffId != null and record.staffId !='' "> and a.STAFF_ID = #{record.staffId} </if> <if test="record.cashierId != null and record.cashierId !='' "> and a.cashier_id = #{record.cashierId} </if> <if test="record.isCross != null and record.isCross !='' "> and a.IS_CROSS = #{record.isCross} @@ -289,6 +299,9 @@ </if> <if test="record.staffId != null and record.staffId !='' "> and a.STAFF_ID = #{record.staffId} </if> <if test="record.cashierId != null and record.cashierId !='' "> and a.cashier_id = #{record.cashierId} </if> <if test="(record.companyId!=null and record.companyId!='') "> and a.company_id = #{record.companyId} @@ -385,6 +398,9 @@ <if test="record.staffId != null and record.staffId !='' "> and a.STAFF_ID = #{record.staffId} </if> <if test="record.cashierId != null and record.cashierId !='' "> and a.cashier_id = #{record.cashierId} </if> <if test="record.isCross != null and record.isCross !='' "> and a.IS_CROSS = #{record.isCross} </if> @@ -441,6 +457,9 @@ <if test="record.staffId != null and record.staffId !='' "> and a.STAFF_ID = #{record.staffId} </if> <if test="record.cashierId != null and record.cashierId !='' "> and a.cashier_id = #{record.cashierId} </if> <if test="record.isCross != null and record.isCross !='' "> and a.IS_CROSS = #{record.isCross} </if> zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
@@ -106,6 +106,7 @@ <th data-field="total">订单总价</th> <th data-field="zkTotal">折后价</th> <th data-field="staffName">顾问姓名</th> <th data-field="cashierName">收银员</th> <th data-field="cashPay">现金付款</th> <th data-field="cardPay">卡付款</th> <th data-field="arrears">欠款</th> zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
@@ -91,6 +91,7 @@ <th data-field="payTime" data-formatter="MGrid.getTime" data-sortable="true">支付时间</th> <th data-field="staffName">下单顾问</th> <th data-field="cashierName">收银员</th> <th data-field="cashPay">现金支付金额</th> <th data-field="cardPay">卡支付金额</th> <th data-field="arrears">欠款金额</th>
