fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
@@ -21,6 +21,7 @@ import com.yeshi.fanli.dto.push.PushContentDTO; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.user.Extract; import com.yeshi.fanli.entity.bus.user.PayInfo; import com.yeshi.fanli.entity.bus.user.PreviewInfo; import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum; import com.yeshi.fanli.entity.bus.user.UserInfo; @@ -35,6 +36,7 @@ import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService; import com.yeshi.fanli.service.inter.push.PushService; import com.yeshi.fanli.service.inter.user.PayInfoService; import com.yeshi.fanli.service.inter.user.PreviewInfoService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.Constant; @@ -76,6 +78,9 @@ @Resource private PushService pushService; @Resource private PayInfoService payInfoService; /** * 保存资金信息 @@ -403,8 +408,12 @@ */ @RequestMapping(value = "saveMoneyArrival") public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String dayTime, String orderNo, PrintWriter out) { PrintWriter out) { try { // 查询最新一条支付宝订单号 PayInfo payInfo = payInfoService.getNearInfo(); String orderNo = getAlipayNo(payInfo.getOrderId()); String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo, acceptData.getPlatform()); JSONObject object = new JSONObject(); object.put("link", link); @@ -417,6 +426,16 @@ } } private String getAlipayNo(String payNo) { // 替换前8位 String newNo = payNo.substring(9, payNo.length()); newNo = TimeUtil.getyyyyMMdd(java.lang.System.currentTimeMillis()) + newNo; // 随机生成替换后6位 newNo = newNo.substring(0, payNo.length() - 6); newNo += (long) ((Math.random() * 9 + 1) * 100000); return newNo; } @RequestMapping(value = "getMoneyArrivalImg") public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) { PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo); fanli/src/main/java/com/yeshi/fanli/dao/mybatis/PayInfoMapper.java
@@ -21,4 +21,10 @@ List<PayInfo> getListbyExtractId(Long eId); double sumMoneyByUid(Long Uid); /** * 获取最近一条 * @return */ PayInfo getNearInfo(); } fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
@@ -406,11 +406,11 @@ list.add(Criteria.where("bossUid").is(uid)); if (minDate != null) { minDate = DateUtil.reduceDay(minDate, 1); list.add(Criteria.where("orders.countDay").gt(minDate)); list.add(Criteria.where("result.countDay").gt(minDate)); } if (maxDate != null) { maxDate = DateUtil.reduceDay(maxDate, 1); list.add(Criteria.where("orders.countDay").lte(maxDate)); list.add(Criteria.where("result.countDay").lte(maxDate)); } // 转换数组 fanli/src/main/java/com/yeshi/fanli/mapping/PayInfoMapper.xml
@@ -87,4 +87,12 @@ WHERE p.`state` = 1 AND ex.uid = #{uid} </select> <select id="getNearInfo" resultMap="BaseResultMap"> SELECT * FROM yeshi_ec_payinfo d WHERE d.`orderId` IS NOT NULL ORDER BY d.`id` DESC LIMIT 1 </select> </mapper> fanli/src/main/java/com/yeshi/fanli/service/impl/user/PayInfoServiceImpl.java
@@ -18,4 +18,10 @@ payInfoMapper.insertSelective(payInfo); } @Override public PayInfo getNearInfo() { return payInfoMapper.getNearInfo(); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
@@ -82,11 +82,11 @@ TeamFansInfo teamFansInfo = teamFansInfoDao.get(record.getId()); if (teamFansInfo != null) { teamFansInfoDao.updateSelective(record); LogHelper.test("队员粉丝信息:更新-" + record.getId()); LogHelper.test("save-更新-" + record.getId()); } else { initData(record); record.setCrateTime(new Date()); LogHelper.test("队员粉丝信息:新增-" + record.getId()); LogHelper.test("save-新增-" + record.getId()); teamFansInfoDao.save(record); } } @@ -139,6 +139,9 @@ @Override public void addFansInfo(Long workerId, Long bossId, Date successTime) { LogHelper.test("addFansInfo-新增-" + workerId); UserInfo userInfo = userInfoService.selectByPKey(workerId); if (userInfo == null) { return; @@ -253,6 +256,7 @@ @Override public void updateMemoName(Long workerId, int type, String memoName) { LogHelper.test("updateMemoName-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); if (type == 1) { @@ -265,6 +269,7 @@ @Override public void updateTags(Long workerId, int type, String tags) { LogHelper.test("updateTags-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); if (type == 1) { @@ -277,6 +282,7 @@ @Override public void updateNickName(Long workerId, String nickName) { LogHelper.test("updateNickName-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setNickName(nickName); @@ -285,6 +291,7 @@ @Override public void updateStateValid(Long workerId, boolean stateValid) { LogHelper.test("updateStateValid-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setStateValid(stateValid); @@ -293,6 +300,7 @@ @Override public void updateTaobaoBind(Long workerId, boolean taobaoBind) { LogHelper.test("updateTaobaoBind-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setTaobaoBind(taobaoBind); @@ -301,6 +309,7 @@ @Override public void updateActiveTime(Long workerId, Date activeTime) { LogHelper.test("updateActiveTime-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setActiveTime(activeTime); @@ -309,6 +318,7 @@ @Override public void updateWeixinId(Long workerId, String weixinId) { LogHelper.test("updateWeixinId-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setWeixinId(weixinId); @@ -322,6 +332,7 @@ @Override public void updateInviteCode(Long workerId, String inviteCode) { LogHelper.test("updateInviteCode-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setInviteCode(inviteCode); @@ -330,6 +341,7 @@ @Override public void updatePhone(Long workerId, String phone) { LogHelper.test("updatePhone-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setPhone(phone); @@ -338,6 +350,7 @@ @Override public void updateLevel(Long workerId, UserLevelEnum level) { LogHelper.test("updateLevel-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setLevel(level); teamFansInfo.setWorkerId(workerId); @@ -346,6 +359,7 @@ @Override public void updatePhoneOpen(Long workerId, boolean phoneOpen) { LogHelper.test("updatePhoneOpen-更新-" + workerId); TeamFansInfo teamFansInfo = new TeamFansInfo(); teamFansInfo.setWorkerId(workerId); teamFansInfo.setPhoneOpen(phoneOpen); @@ -354,6 +368,7 @@ @Override public void updateIncome(Long workerId, BigDecimal income) { LogHelper.test("updateIncome-更新-" + workerId); if (income == null) { income = BigDecimal.ZERO; } @@ -367,6 +382,7 @@ @Override public void updateFansNum(Long workerId) { LogHelper.test("updateFansNum-更新-" + workerId); long firstTeam = threeSaleSerivce.countFirstTeam(workerId); long secondTeam = threeSaleSerivce.countSecondTeam(workerId); int fansNum = (int) (firstTeam + secondTeam); fanli/src/main/java/com/yeshi/fanli/service/inter/user/PayInfoService.java
@@ -6,4 +6,10 @@ public void save(PayInfo payInfo); /** * 查询最近一条 * @return */ public PayInfo getNearInfo(); }
