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

fix neupos

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
8b132d5adc
5 измененных файлов: 45 добавлений и 1 удалений
  1. +8
    -0
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
  4. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
  5. +24
    -0
      mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml

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

@@ -58,6 +58,14 @@ public class NeuPosAdminController extends BaseController {
return new ResultData(maplist); return new ResultData(maplist);
} }
@ApiOperation("集团类型流水总数")
@GetMapping("payTypeOrderSum")
public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example) {
example.setOrgId(24);
List<Map> maplist = neuPosOrderService.queryShopPayOrderSum(example);
return new ResultData(maplist);
}
@ApiOperation("门店流水") @ApiOperation("门店流水")
@GetMapping("shopOrderlist") @GetMapping("shopOrderlist")
@ApiImplicitParams({ @ApiImplicitParams({


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

@@ -15,6 +15,8 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper<NeuPosOrderMaster
List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example); List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
List<Map> selectShopList(@Param("orgId") Integer orgId); List<Map> selectShopList(@Param("orgId") Integer orgId);
List<Map> selectPayTypeList(); List<Map> selectPayTypeList();


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java Просмотреть файл

@@ -14,6 +14,8 @@ public interface NeuPosOrderService {
*/ */
PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
/** /**
* 门店类型流水 * 门店类型流水


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

@@ -34,7 +34,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
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 null;
return pageInfo;
} }
List<Map> payOrderList = pageInfo.getList(); List<Map> payOrderList = pageInfo.getList();
List<Map> payTypeMap = posOrderMapper.selectPayTypeList(); List<Map> payTypeMap = posOrderMapper.selectPayTypeList();
@@ -58,6 +58,12 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
return pageInfo; return pageInfo;
} }


@Override
public List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example) {
return posOrderMapper.queryShopPayOrderSum(example);
}
@Override @Override
public List<Map> selectPayTypeList() { public List<Map> selectPayTypeList() {
return posOrderMapper.selectPayTypeList(); return posOrderMapper.selectPayTypeList();
@@ -67,5 +73,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
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.queryOrderList(example));
} }


} }

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

@@ -49,6 +49,30 @@
GROUP BY pay_type GROUP BY pay_type
</select> </select>
<select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
select ifnull(sum(order_amount),0) as payAmount,
ifnull(sum(discount_amount),0) as discountAmount,
count(order_amount) as payCount,
ifnull(sum(if(order_status=4,real_pay_amount,0)),0) refundAmount,
count(if(order_status=4,true,null)) refundCount,
ifnull(sum(if(order_status=2,real_pay_amount,0)),0) as amount,
pay_type as payType
from order_master
where pay_status = 2 and order_type != '3'
<if test=" orgId != null">
and org_id = #{orgId}
</if>
<if test=" shopId != null">
and shop_id = #{shopId}
</if>
<if test=" createBegin != null">
and created_at &gt;= #{createBegin}
</if>
<if test=" createEnd != null">
and created_at &lt;= #{createEnd}
</if>
</select>
<select id="selectShopList" parameterType="Integer" resultType="java.util.Map"> <select id="selectShopList" parameterType="Integer" resultType="java.util.Map">
select id,name from `shop` where status = 1 select id,name from `shop` where status = 1
<if test=" orgId != null"> <if test=" orgId != null">


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