fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoDao.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShareManageServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShareManageService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.HttpUtil; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.NumberUtil; import org.yeshi.utils.wx.WXUtil; import com.google.gson.Gson; @@ -69,7 +68,6 @@ import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.ScanHistoryService; import com.yeshi.fanli.service.inter.user.ShamUserService; import com.yeshi.fanli.service.inter.user.ShareManageService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.AESUtil; import com.yeshi.fanli.util.Constant; @@ -106,10 +104,7 @@ @Resource private ConfigService configService; @Resource private ShareManageService shareManageService; @Resource private HongBaoManageService hongBaoManageService; @@ -502,33 +497,6 @@ } } @RequestMapping(value = "shareSubmit", method = RequestMethod.POST) public void getShareSubmit(long uid, String share, PrintWriter out) { String uidStr = StringUtil.getFromBase64(share); boolean b = NumberUtil.isNumeric(uidStr); if (!b) { out.print(JsonUtil.loadTrueResult("0")); // 不存在该邀请码 return; } long inviterId = Long.parseLong(uidStr); int type = shareManageService.addShareManage(inviterId, uid); if (type == -1) { out.print(JsonUtil.loadTrueResult("-1")); // 邀请者与被邀请者不能相同 return; } else if (type == 0) { out.print(JsonUtil.loadTrueResult("0")); // 不存在该邀请码 return; } else if (type == 2) { out.print(JsonUtil.loadTrueResult("2")); // 被邀请者不是新用户 return; } else if (type == 3) { out.print(JsonUtil.loadTrueResult("3")); // 被邀请者已存在 return; } else { out.print(JsonUtil.loadTrueResult("1")); // 添加成功 } } @RequestMapping("details") fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -98,13 +98,11 @@ import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.ShamUserService; import com.yeshi.fanli.service.inter.user.ShareManageService; import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserCustomSettingsService; import com.yeshi.fanli.service.inter.user.UserGoodsStorageService; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.AESUtil; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; @@ -148,9 +146,6 @@ @Resource private ScanHistoryV2Service scanHistoryV2Service; @Resource private ShareManageService shareManageService; @Resource private ConfigService configService; fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
@@ -33,7 +33,6 @@ import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.ScanHistoryService; import com.yeshi.fanli.service.inter.user.ShareManageService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; @@ -74,9 +73,6 @@ @Resource private ScanHistoryService scanHistoryService; @Resource private ShareManageService shareManageService; @Resource private ConfigService configService; fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareServiceImpl.java
@@ -1,30 +1,21 @@ package com.yeshi.fanli.service.impl.goods; import java.io.Serializable; import java.util.List; import javax.annotation.Resource; import javax.transaction.Transactional; import org.springframework.stereotype.Service; import com.yeshi.fanli.dao.hongbao.HongBaoDao; import com.yeshi.fanli.dao.mybatis.share.ShareMapper; import com.yeshi.fanli.dto.HongBao; import com.yeshi.fanli.entity.taobao.PidUser; import com.yeshi.fanli.entity.taobao.ShareTaoPassword; import com.yeshi.fanli.service.inter.goods.ShareService; import com.yeshi.fanli.util.Constant; @Service public class ShareServiceImpl implements ShareService { @Resource private ShareMapper shareMapper; @Resource private HongBaoDao hongBaoDao; @Override public String getRandomPid() { return shareMapper.getRandomPid(); @@ -74,27 +65,13 @@ } @Override public List<HongBao> getShareList(int pageIndex, long uid) { List<HongBao> shareList = hongBaoDao.list("from HongBao hb where hb.userInfo.id = ? and hb.type = '20' order by hb.createtime desc", (pageIndex - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, new Serializable[] { uid }); return shareList; } @Override public int getInviteCount(long uid) { return shareMapper.getInviteCount(uid); } @Override public List<HongBao> getInviteList(int pageIndex, long uid) { List<HongBao> shareList = hongBaoDao.list("from HongBao hb where (hb.type = '6' or hb.type = '7') and hb.userInfo.id = ? order by hb.createtime desc", (pageIndex - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, new Serializable[] { uid }); return shareList; } @Override public int getShareMoneyCount() { return shareMapper.getShareMoneyCount(); } } fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -30,7 +30,6 @@ import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.order.HongBaoOrderService; import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.user.ShareManageService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.Utils; @@ -43,9 +42,6 @@ @Resource private OrderService orderService; @Resource private ShareManageService shareManageService; @Resource private ConfigService configService; fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShareManageServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareService.java
@@ -1,8 +1,5 @@ package com.yeshi.fanli.service.inter.goods; import java.util.List; import com.yeshi.fanli.dto.HongBao; import com.yeshi.fanli.entity.taobao.PidUser; import com.yeshi.fanli.entity.taobao.ShareTaoPassword; @@ -39,16 +36,6 @@ */ int getCount(long uid); /** * * 方法说明: 获取分享赚列表 * @author mawurui * createTime 2018年4月16日 上午10:51:32 * @param pageIndex * @param uid * @return */ List<HongBao> getShareList(int pageIndex, long uid); /** * @@ -59,8 +46,6 @@ * @return */ int getInviteCount(long uid); List<HongBao> getInviteList(int pageIndex, long uid); /** * fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShareManageService.java
File was deleted