diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 7c70a64c8..3b94a829b 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -154,6 +156,41 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } + @ApiOperation("最近10天集团单一商户流水") + @GetMapping("dateMerchantOrderlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "phone", value = "账号", dataType = "String", paramType = "query", required = true)}) + public ResultData dateMerchantOrderlist(@ModelAttribute NeuPosOrderMasterExt example, String phone) { +// if (!tenantValid(tenantId)) { +// return new ResultData(Result.ERROR,"未安装POS系统"); +// } + setDate(example); + example.setOrgId(24); + //phone账号登录名 + List ushops = neuPosOrderService.selectUserShopList(24, phone); + if (null == ushops || ushops.size() <= 0 ) { + return new ResultData(); + } + Map us = ushops.get(0); + Integer shopId = (Integer) us.get("shop"); + //Long uid = (Long) us.get("id"); + //String nickname = (String) us.get("nickname"); + example.setShopId(shopId); + Date current = DateUtils.getDayBegin(new Date()); + Date begin = DateUtils.getTimeAfterDays(-10, current); + Map> result = new HashMap>(); + for (int i = 0 ; i< 10 ; i++) { + Date _b = DateUtils.getTimeAfterDays(i, begin);; + Date _e = DateUtils.getDayEnd(_b); + example.setCreateBegin(_b); + example.setCreateEnd(_e); + PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,1,1); + result.put(DateUtils.date2String(_b,DateUtils.DATE_PATTERN), maplist); + } + + return new ResultData(result); + } + @ApiOperation("集团类型流水总数") @GetMapping("payTypeOrderSum")