From 98d98236aa182386835d65794f772f6425cb14b5 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期四, 22 十一月 2018 15:02:00 +0800 Subject: [PATCH] Merge branch 'dev1' --- fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java index 2c71903..c3cb164 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java @@ -377,6 +377,17 @@ return threeSaleMapper.getMyBoss(uid); } + + @Override + public ThreeSale selectByPrimaryKey(Long id) { + return threeSaleMapper.selectByPrimaryKey(id); + } + + + @Override + public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire) { + return threeSaleMapper.listbyIdAndBossId(id, uid, expire); + } @Override public JSONObject getMyFirstTeam(long start, int count, Long uid) { @@ -412,10 +423,11 @@ JSONArray resultArray = new JSONArray(); for (ThreeSale threeSale: list) { - JSONObject object = new JSONObject(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + // 閭�璇穒d + object.put("inviteId", threeSale.getId()); Long createTime = threeSale.getCreateTime(); Date inviteTime = new Date(createTime); -- Gitblit v1.8.0