记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit a1eb5602 authored by zhengfuxin's avatar zhengfuxin
Browse files
Options

计算定时任务

parent c88255a1
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 6 deletions
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java
View file @ a1eb5602
......@@ -15,6 +15,7 @@ public class SmileRedisConst {
public static final String SELL_DATA_DETAIL = PREFIX.concat("sellDataDetail:"); //销售数据 第一步
public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:"); //销售数据 第一步
public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:"); //打款信息 SELL_SHOW_PAYMENT+演出id+uid
public static final String SELL_USER_REVENUE = PREFIX.concat("user:revenue:"); //用户总营收 SELL_USER_REVENUE+uid
......
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataDetailVO.java
View file @ a1eb5602
......@@ -29,9 +29,14 @@ public class SellDataDetailVO implements Serializable {
private String mobile;
@ApiModelProperty(value = "订单时间")
private String createAt;
private String dataId;*/
@ApiModelProperty(value = "orderId:订单id,number:数量，mobile：电话，createAt：订单时间")
private String ticketName;
@ApiModelProperty(value = "活动名字")
private String activeName;
@ApiModelProperty(value = "票的总量")
private int count;
@ApiModelProperty(value = "orderId:订单id,number:数量，mobile：电话，createAt：订单时间")
List<Map> list;
private String dataId;
......
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java
View file @ a1eb5602
package com.liquidnet.service.goblin.service.manage;
import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -11,4 +12,5 @@ public interface SmileFrontService {
public List<KylinPerformanceVo> getPerformance();
public void deleteUser(String uid);
public boolean auth(String uid,SmileUserVO redisVo);
public SellDataDetailVO getSellDataDetail(String agentId,String ticketId,String activeName,String ticketName);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ a1eb5602
......@@ -104,7 +104,8 @@
</select>
<select id="getUserSellDetail" parameterType="String" resultType="java.util.Map">
select o.user_mobile as 'mobile',o.order_tickets_id as 'orderId',(o.number-refund_number) as 'number',DATE_FORMAT(o.created_at,'%Y-%m-%d %H:%i:%s') as 'createTime' from kylin_order_tickets as o
/*DATE_FORMAT(o.created_at,'%Y-%m-%d %H:%i:%s')*/
select o.user_mobile as 'mobile',o.order_tickets_id as 'orderId',(o.number-refund_number) as 'number',o.created_at as 'createTime' from kylin_order_tickets as o
, kylin_order_ticket_status as s,kylin_order_ticket_relations as r
where o.order_tickets_id=s.order_id and o.order_tickets_id=r.order_id
and r.agent_id=#{agentId} and s.pay_status='1' and r.ticket_id=#{ticketId} and (o.number-refund_number)>0
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java
View file @ a1eb5602
......@@ -156,7 +156,7 @@ public class SellDataInfoImpl {
commissionVO.setDaiRuZhang(daiRuZhang);
commissionVO.setKeJieSuan(keJieSuan);
commissionVO.setZongYingShou((BigDecimal) redisSmileUtil.get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
redisSmileUtil.set(SmileRedisConst.SELL_DATA_COMMISSION.concat(smileUser.getUid()),commissionVO);
}
}
}
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java
View file @ a1eb5602
......@@ -9,14 +9,14 @@ import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.service.manage.SmileFrontService;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -35,6 +35,8 @@ public class SmileUserController {
private RedisUtil redisUtil;
@Autowired
private SmileFrontService smileFrontService;
@Autowired
private MongoTemplate mongoTemplate;
@GetMapping("getUser")
@ApiOperation("获取用户状态，如果没查到，则返回null")
......@@ -145,6 +147,28 @@ public class SmileUserController {
return ResponseDto.success();
}
@GetMapping("getSellDataOne")
@ApiOperation("获取销售数据")
public ResponseDto<SellDataVO> getSellDataOne(@RequestParam String performanceId) {
String userId = CurrentUtil.getCurrentUid();
SellDataVO sellDataVO = (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
return ResponseDto.success(sellDataVO);
}
@GetMapping("getSellDataTwo")
@ApiOperation("获取XX票订单数据")
public ResponseDto<SellDataDetailVO> getSellDataDetail(@RequestParam String ticketId,String activeName,String ticketName) {
String userId = CurrentUtil.getCurrentUid();
SellDataDetailVO sellDataDetailVO1=smileFrontService.getSellDataDetail(userId,ticketId,activeName,ticketName);
return ResponseDto.success(sellDataDetailVO1);
}
@GetMapping("getCommission")
@ApiOperation("获取佣金明细")
public ResponseDto<CommissionVO> getCommission() {
String userId = CurrentUtil.getCurrentUid();
CommissionVO commissionVO= (CommissionVO) redisUtil.get(SmileRedisConst.SELL_USER_REVENUE.concat(userId));
return ResponseDto.success(commissionVO);
}
}
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java
View file @ a1eb5602
......@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.service.manage.SmileFrontService;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -13,13 +14,18 @@ import com.liquidnet.service.util.ObjectUtil;
import com.liquidnet.service.util.QueueUtils;
import com.liquidnet.service.util.SmileMongoUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Service
@Slf4j
......@@ -30,6 +36,8 @@ public class SmileFrontServiceImpl implements SmileFrontService {
private SmileMongoUtils smileMongoUtils;
@Autowired
QueueUtils queueUtils;
@Autowired
private MongoTemplate mongoTemplate;
public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
//redis里面更新
if(null==redisVo){
......@@ -115,6 +123,28 @@ public class SmileFrontServiceImpl implements SmileFrontService {
return true;
}
@Override
public SellDataDetailVO getSellDataDetail(String agentId, String ticketId,String activeName,String ticketName) {
SellDataDetailVO sellDataDetailVO = mongoTemplate.findOne(Query.query(Criteria.where("dataId").is(agentId+ticketId)),
SellDataDetailVO.class, SellDataDetailVO.class.getSimpleName());
//把手机变为 ***
// 计算票的总量
List<Map> list=sellDataDetailVO.getList();
int number=0;
for(Map a:list){
String mobile=a.get("mobile")==null?"":a.get("mobile").toString();
if(StringUtils.isNotBlank(mobile)){
mobile=mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length());
a.replace("mobile",mobile);
}
int d= a.get("number")==null?0:Integer.parseInt(a.get("number").toString());
number=number + d;
}
sellDataDetailVO.setCount(number);
return sellDataDetailVO;
}
public void setUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
if(type.equals("1")){
redisVo.setImg(smileUserVO.getImg());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment