Просмотр исходного кода

fix neupos

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
843f3b5bf1
5 измененных файлов: 71 добавлений и 43 удалений
  1. +0
    -16
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
  4. +7
    -12
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
  5. +60
    -14
      mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml

+ 0
- 16
mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java Просмотреть файл

@@ -105,22 +105,6 @@ public class NeuPosAdminController extends BaseController {
return new ResultData(maplist); 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<Map> maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize);
return new ResultData(maplist);
}
@ApiOperation("流水记录") @ApiOperation("流水记录")
@GetMapping("orderlist") @GetMapping("orderlist")
@ApiImplicitParams({ @ApiImplicitParams({


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java Просмотреть файл

@@ -1,6 +1,8 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import java.util.Date; import java.util.Date;
import java.util.List;

import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -15,4 +17,5 @@ public class NeuPosOrderMasterExt extends BaseEntity{
private Integer shopId; private Integer shopId;
private Date createBegin; private Date createBegin;
private Date createEnd; private Date createEnd;
private List<String> payTypeList;
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java Просмотреть файл

@@ -23,6 +23,6 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper<NeuPosOrderMaster
List<String> selectOrgPayType(@Param("orgId") Integer orgId); List<String> selectOrgPayType(@Param("orgId") Integer orgId);
List<Map> queryOrderList(NeuPosOrderMasterExt example);
List<Map> queryOrderListByConditions(NeuPosOrderMasterExt example);


} }

+ 7
- 12
mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java Просмотреть файл

@@ -32,25 +32,20 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {


@Override @Override
public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
List<String> orgPayType = posOrderMapper.selectOrgPayType(example.getOrgId());
example.setPayTypeList(orgPayType);
PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example)); PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example));
if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) {
return pageInfo; return pageInfo;
} }
List<Map> payOrderList = pageInfo.getList(); List<Map> payOrderList = pageInfo.getList();
List<Map> payTypeMap = posOrderMapper.selectPayTypeList(); List<Map> payTypeMap = posOrderMapper.selectPayTypeList();
List<String> orgPayType = posOrderMapper.selectOrgPayType(example.getOrgId());
Map<Integer,String> typeMap = new HashMap<Integer,String>(); Map<Integer,String> typeMap = new HashMap<Integer,String>();
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 ) { for (Map payOrder:payOrderList ) {
Integer payType = Integer.parseInt((String)payOrder.get("payType")); Integer payType = Integer.parseInt((String)payOrder.get("payType"));
if (null != payType && typeMap.containsKey(payType)) { if (null != payType && typeMap.containsKey(payType)) {
@@ -79,7 +74,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {


@Override @Override
public PageInfo<Map> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { public PageInfo<Map> 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));
} }






+ 60
- 14
mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml Просмотреть файл

@@ -50,7 +50,7 @@
FROM FROM
pay_order_v2 pay_order_v2
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number 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')
<if test=" orgId != null"> <if test=" orgId != null">
and order_master_v2.org_id = #{orgId} and order_master_v2.org_id = #{orgId}
</if> </if>
@@ -63,6 +63,12 @@
<if test=" createEnd != null"> <if test=" createEnd != null">
and pay_order_v2.created_at &lt;= #{createEnd} and pay_order_v2.created_at &lt;= #{createEnd}
</if> </if>
<if test=" null != payTypeList ">
and pay_order_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 )
GROUP BY GROUP BY
pay_type pay_type
@@ -75,7 +81,7 @@
FROM FROM
pay_refund_order_v2 AS pay_order_v2 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 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')
<if test=" orgId != null"> <if test=" orgId != null">
and order_master_v2.org_id = #{orgId} and order_master_v2.org_id = #{orgId}
</if> </if>
@@ -88,10 +94,23 @@
<if test=" createEnd != null"> <if test=" createEnd != null">
and pay_order_v2.created_at &lt;= #{createEnd} and pay_order_v2.created_at &lt;= #{createEnd}
</if> </if>
<if test=" null != payTypeList ">
and pay_order_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
AND refund_status = 2 AND refund_status = 2
GROUP BY GROUP BY
pay_type pay_type
) AS refund ON pay_type_dict_v2.pay_type = refund.payType ) AS refund ON pay_type_dict_v2.pay_type = refund.payType
where pay_type_dict_v2.pay_type not in ('29','30')
<if test=" null != payTypeList ">
and pay_type_dict_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
</select> </select>
<select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> <select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
@@ -118,7 +137,7 @@ SELECT
FROM FROM
pay_order_v2 pay_order_v2
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number 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')
<if test=" orgId != null"> <if test=" orgId != null">
and order_master_v2.org_id = #{orgId} and order_master_v2.org_id = #{orgId}
</if> </if>
@@ -131,6 +150,12 @@ SELECT
<if test=" createEnd != null"> <if test=" createEnd != null">
and pay_order_v2.created_at &lt;= #{createEnd} and pay_order_v2.created_at &lt;= #{createEnd}
</if> </if>
<if test=" null != payTypeList ">
and pay_order_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 )
GROUP BY GROUP BY
pay_type pay_type
@@ -143,7 +168,7 @@ SELECT
FROM FROM
pay_refund_order_v2 AS pay_order_v2 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 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')
<if test=" orgId != null"> <if test=" orgId != null">
and order_master_v2.org_id = #{orgId} and order_master_v2.org_id = #{orgId}
</if> </if>
@@ -156,10 +181,23 @@ SELECT
<if test=" createEnd != null"> <if test=" createEnd != null">
and pay_order_v2.created_at &lt;= #{createEnd} and pay_order_v2.created_at &lt;= #{createEnd}
</if> </if>
<if test=" null != payTypeList ">
and pay_order_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
AND refund_status = 2 AND refund_status = 2
GROUP BY GROUP BY
pay_type pay_type
) AS refund ON pay_type_dict_v2.pay_type = refund.payType ) AS refund ON pay_type_dict_v2.pay_type = refund.payType
where pay_type_dict_v2.pay_type not in ('29','30')
<if test=" null != payTypeList ">
and pay_type_dict_v2.pay_type in
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")">
#{payTypeItem}
</foreach>
</if>
) as _temp ) as _temp
</select> </select>
@@ -175,24 +213,32 @@ SELECT
select pay_type,name from `trade_pay_type_dict` select pay_type,name from `trade_pay_type_dict`
</select> </select>
<select id="queryOrderList" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
SELECT order_number as orderNumber, serial_no as serialNo, order_amount as orderAmount,real_pay_amount as realPayAmount,
discount_amount as discountAmount, pay_type as payType,paid_time as paidTime,order_status as orderStatus
from order_master_v2
where order_status = 4 and order_type != '3'
<select id="queryOrderListByConditions" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
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
<if test=" orgId != null"> <if test=" orgId != null">
and org_id = #{orgId}
and o.org_id = #{orgId}
</if> </if>
<if test=" shopId != null"> <if test=" shopId != null">
and shop_id = #{shopId}
and o.shop_id = #{shopId}
</if> </if>
<if test=" createBegin != null"> <if test=" createBegin != null">
and created_at &gt;= #{createBegin}
and o.created_at &gt;= #{createBegin}
</if> </if>
<if test=" createEnd != null"> <if test=" createEnd != null">
and created_at &lt;= #{createEnd}
and o.created_at &lt;= #{createEnd}
</if> </if>
ORDER BY created_at desc
GROUP BY
o.order_number
ORDER BY o.created_at desc
</select> </select>
</mapper> </mapper>

Загрузка…
Отмена
Сохранить