diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 6c729226e..1fff27679 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -105,22 +105,6 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } - @ApiOperation("门店流水") - @GetMapping("shopOrderlist") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) - public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { - if (!tenantValid(tenantId)) { - return new ResultData(Result.ERROR,"未安装POS系统"); - } - setDate(example); - example.setOrgId(24); - PageInfo maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize); - return new ResultData(maplist); - } - @ApiOperation("流水记录") @GetMapping("orderlist") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java b/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java index 27fef2ff8..c837d0b5f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import java.util.Date; +import java.util.List; + import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,4 +17,5 @@ public class NeuPosOrderMasterExt extends BaseEntity{ private Integer shopId; private Date createBegin; private Date createEnd; + private List payTypeList; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index 8814d87fe..88c052b52 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -23,6 +23,6 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper selectOrgPayType(@Param("orgId") Integer orgId); - List queryOrderList(NeuPosOrderMasterExt example); + List queryOrderListByConditions(NeuPosOrderMasterExt example); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index de81bc5ce..5e624e5ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -32,25 +32,20 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { @Override public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { + List orgPayType = posOrderMapper.selectOrgPayType(example.getOrgId()); + example.setPayTypeList(orgPayType); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example)); if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { return pageInfo; } List payOrderList = pageInfo.getList(); List payTypeMap = posOrderMapper.selectPayTypeList(); - List orgPayType = posOrderMapper.selectOrgPayType(example.getOrgId()); Map typeMap = new HashMap(); - for (String _payType : orgPayType) { - if(_payType.equals("29") || _payType.equals("30")) { - continue; - } - for (Map payt:payTypeMap) { - String payttye = (String)payt.get("pay_type"); - if (payttye.equals(_payType)) { - typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); - } - } + for (Map payt:payTypeMap) { + String payttye = (String)payt.get("pay_type"); + typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); } + for (Map payOrder:payOrderList ) { Integer payType = Integer.parseInt((String)payOrder.get("payType")); if (null != payType && typeMap.containsKey(payType)) { @@ -79,7 +74,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { @Override public PageInfo queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example)); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderListByConditions(example)); } diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 5af7e0a65..0c3173bb3 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -50,7 +50,7 @@ FROM pay_order_v2 LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number - where order_master_v2.order_type != '3' + where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') and order_master_v2.org_id = #{orgId} @@ -63,6 +63,12 @@ and pay_order_v2.created_at <= #{createEnd} + + and pay_order_v2.pay_type in + + #{payTypeItem} + + AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) GROUP BY pay_type @@ -75,7 +81,7 @@ FROM pay_refund_order_v2 AS pay_order_v2 LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number - where order_master_v2.order_type != '3' + where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') and order_master_v2.org_id = #{orgId} @@ -88,10 +94,23 @@ and pay_order_v2.created_at <= #{createEnd} + + and pay_order_v2.pay_type in + + #{payTypeItem} + + AND refund_status = 2 GROUP BY pay_type ) AS refund ON pay_type_dict_v2.pay_type = refund.payType + where pay_type_dict_v2.pay_type not in ('29','30') + + and pay_type_dict_v2.pay_type in + + #{payTypeItem} + + @@ -175,24 +213,32 @@ SELECT select pay_type,name from `trade_pay_type_dict` - + SELECT o.paid_time AS paidTime,o.order_number AS orderNumber,o.serial_no AS serialNo, + o.order_amount/100 AS orderAmount, + sum( IF ( p.pay_type = 29, pay_amount, 0 ) )/100 AS discountAmount, + o.real_pay_amount / 100 AS realPayAmount, + o.order_status AS orderStatus, + p.pay_type as payType + FROM + order_master_v2 AS o + LEFT JOIN pay_order_v2 AS p ON o.order_number = p.m_order_number + where 1=1 - and org_id = #{orgId} + and o.org_id = #{orgId} - and shop_id = #{shopId} + and o.shop_id = #{shopId} - and created_at >= #{createBegin} + and o.created_at >= #{createBegin} - and created_at <= #{createEnd} + and o.created_at <= #{createEnd} - ORDER BY created_at desc + GROUP BY + o.order_number + ORDER BY o.created_at desc \ No newline at end of file