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

Skip to content

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

修改bug

parent 096db18e
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 58 deletions
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataDetailVO.java → liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSellDataDetailVO.java
View file @ 140832fe
......@@ -18,7 +18,7 @@ import java.util.Map;
*/
@ApiModel(value = "SellDataOneVO", description = "销量数据")
@Data
public class SellDataDetailVO implements Serializable {
public class SmileSellDataDetailVO implements Serializable {
private static final long serialVersionUID = 1L;
/* @ApiModelProperty(value = "订单id")
......@@ -41,13 +41,13 @@ public class SellDataDetailVO implements Serializable {
private String dataId;
//private String
private static final SellDataDetailVO obj = new SellDataDetailVO();
private static final SmileSellDataDetailVO obj = new SmileSellDataDetailVO();
public static SellDataDetailVO getNew() {
public static SmileSellDataDetailVO getNew() {
try {
return (SellDataDetailVO) obj.clone();
return (SmileSellDataDetailVO) obj.clone();
} catch (CloneNotSupportedException e) {
return new SellDataDetailVO();
return new SmileSellDataDetailVO();
}
}
......
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataVO.java → liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSellDataVO.java
View file @ 140832fe
......@@ -21,7 +21,7 @@ import java.util.List;
*/
@ApiModel(value = "SellDataOneVO", description = "销量数据")
@Data
public class SellDataVO implements Serializable {
public class SmileSellDataVO implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -44,13 +44,13 @@ public class SellDataVO implements Serializable {
private int deltag;
private static final SellDataVO obj = new SellDataVO();
private static final SmileSellDataVO obj = new SmileSellDataVO();
public static SellDataVO getNew() {
public static SmileSellDataVO getNew() {
try {
return (SellDataVO) obj.clone();
return (SmileSellDataVO) obj.clone();
} catch (CloneNotSupportedException e) {
return new SellDataVO();
return new SmileSellDataVO();
}
}
......
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java
View file @ 140832fe
package com.liquidnet.service.goblin.service.manage;
import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -12,5 +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);
public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @ 140832fe
......@@ -11,7 +11,7 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.service.goblin.dto.vo.SellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
import com.liquidnet.service.kylin.dao.KylinOrderTicketAndAgentVo;
import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -175,8 +175,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
return AjaxResult.warn("不可重复打款");
}
//查询该用户的佣金
SellDataVO sellDataVO = smileRedisUtils.getSellDataVO(smilePriceParam.getUid(), smilePriceParam.getPerformancesId());
smilePrice.setPrice(sellDataVO.getTotalCommission());
SmileSellDataVO smileSellDataVO = smileRedisUtils.getSellDataVO(smilePriceParam.getUid(), smilePriceParam.getPerformancesId());
smilePrice.setPrice(smileSellDataVO.getTotalCommission());
if (smilePriceParam.getStatus().equals(0)){
smilePrice.setCreatedDate(LocalDateTime.now());
smilePriceMapper.insert(smilePrice);
......@@ -352,8 +352,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
private UserData getUserData(String performancesId, SmileUser smileUser) {
UserData userData = new UserData();
SellDataVO sellDataVO = smileRedisUtils.getSellDataVO(smileUser.getUid(), performancesId);
BeanUtils.copyProperties(sellDataVO, userData);
SmileSellDataVO smileSellDataVO = smileRedisUtils.getSellDataVO(smileUser.getUid(), performancesId);
BeanUtils.copyProperties(smileSellDataVO, userData);
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java
View file @ 140832fe
......@@ -2,7 +2,7 @@ package com.liquidnet.client.admin.zhengzai.smile.utils;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
......@@ -119,8 +119,8 @@ public class SmileRedisUtils {
/**
* 获取用户数据
*/
public SellDataVO getSellDataVO(String uid,String performancesId){
return (SellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
public SmileSellDataVO getSellDataVO(String uid, String performancesId){
return (SmileSellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
}
/**
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/smile/SellDataController.java
View file @ 140832fe
......@@ -34,5 +34,12 @@ public class SellDataController {
return ResponseDto.success();
}
public static void main(String[] args) {
String s="img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id";
System.out.println(s.split(",").length);
String s1="?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?";
System.out.println(s1.split(",").length);
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java
View file @ 140832fe
......@@ -4,9 +4,9 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.CommissionVO;
import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SellDataOneVO;
import com.liquidnet.service.goblin.dto.vo.SellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.liquidnet.service.smile.entity.SmileUser;
......@@ -99,24 +99,24 @@ public class SellDataInfoImpl {
}
}
Map allDate=orderTicketsMapper.getUserSellAllDate(smileUser.getUid(),performanceId);
SellDataVO sellDataVO=SellDataVO.getNew();
SmileSellDataVO smileSellDataVO = SmileSellDataVO.getNew();
if(null!=allDate){
//活动名称 需要再查 目前没有
sellDataVO.setDeltag(0);
sellDataVO.setSellDataId(smileUser.getUid().concat(performanceId));
sellDataVO.setActiveName(yanChuName);
sellDataVO.setSellAmount(new BigDecimal(allDate.get("price")==null?"0":allDate.get("price").toString()));
sellDataVO.setSellNumber(new BigDecimal(allDate.get("number")==null?"0":allDate.get("number").toString()));
sellDataVO.setTotalCommission(new BigDecimal(allDate.get("commiss")==null?"0":allDate.get("commiss").toString()));
sellDataVO.setSellDataOneVO(listSellDataOneVo);
sellDataVO.setUpdateTime(LocalDateTime.now());
smileSellDataVO.setDeltag(0);
smileSellDataVO.setSellDataId(smileUser.getUid().concat(performanceId));
smileSellDataVO.setActiveName(yanChuName);
smileSellDataVO.setSellAmount(new BigDecimal(allDate.get("price")==null?"0":allDate.get("price").toString()));
smileSellDataVO.setSellNumber(new BigDecimal(allDate.get("number")==null?"0":allDate.get("number").toString()));
smileSellDataVO.setTotalCommission(new BigDecimal(allDate.get("commiss")==null?"0":allDate.get("commiss").toString()));
smileSellDataVO.setSellDataOneVO(listSellDataOneVo);
smileSellDataVO.setUpdateTime(LocalDateTime.now());
//redis 里面放入
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId),sellDataVO);
if(mongoTemplate.exists(Query.query(Criteria.where("sellDataId").is(sellDataVO.getSellDataId())), SellDataVO.class, SellDataVO.class.getSimpleName())){
mongoTemplate.remove(Query.query(Criteria.where("sellDataId").is(sellDataVO.getSellDataId())), SellDataVO.class, SellDataVO.class.getSimpleName());
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
if(mongoTemplate.exists(Query.query(Criteria.where("sellDataId").is(smileSellDataVO.getSellDataId())), SmileSellDataVO.class, SmileSellDataVO.class.getSimpleName())){
mongoTemplate.remove(Query.query(Criteria.where("sellDataId").is(smileSellDataVO.getSellDataId())), SmileSellDataVO.class, SmileSellDataVO.class.getSimpleName());
}
//mongodb 里面放入
mongoTemplate.insert(sellDataVO,SellDataVO.class.getSimpleName());
mongoTemplate.insert(smileSellDataVO, SmileSellDataVO.class.getSimpleName());
}
}
......@@ -134,11 +134,11 @@ public class SellDataInfoImpl {
*/
public void setDataDetial(String agentId,String ticketId){
List<Map> list= orderTicketsMapper.getUserSellDetail(agentId,ticketId);
SellDataDetailVO sellDataDetailVO=SellDataDetailVO.getNew();
sellDataDetailVO.setDataId(agentId+ticketId);
sellDataDetailVO.setList(list);
SmileSellDataDetailVO smileSellDataDetailVO = SmileSellDataDetailVO.getNew();
smileSellDataDetailVO.setDataId(agentId+ticketId);
smileSellDataDetailVO.setList(list);
// mongodb
mongoTemplate.insert(sellDataDetailVO,SellDataDetailVO.class.getSimpleName());
mongoTemplate.insert(smileSellDataDetailVO, SmileSellDataDetailVO.class.getSimpleName());
}
/**
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java
View file @ 140832fe
......@@ -210,18 +210,18 @@ public class SmileUserController {
@GetMapping("getSellDataOne")
@ApiOperation("获取销售数据")
public ResponseDto<SellDataVO> getSellDataOne(@RequestParam String performanceId) {
public ResponseDto<SmileSellDataVO> getSellDataOne(@RequestParam String performanceId) {
String userId = CurrentUtil.getCurrentUid();
SellDataVO sellDataVO = smileRedisUtils.getSellDataVo(userId,performanceId);
return ResponseDto.success(sellDataVO);
SmileSellDataVO smileSellDataVO = smileRedisUtils.getSellDataVo(userId,performanceId);
return ResponseDto.success(smileSellDataVO);
}
@GetMapping("getSellDataTwo")
@ApiOperation("获取XX票订单数据")
public ResponseDto<SellDataDetailVO> getSellDataDetail(@RequestParam String ticketId,String activeName,String ticketName) {
public ResponseDto<SmileSellDataDetailVO> getSellDataDetail(@RequestParam String ticketId, String activeName, String ticketName) {
String userId = CurrentUtil.getCurrentUid();
log.debug("用户id{}",userId);
SellDataDetailVO sellDataDetailVO1=smileFrontService.getSellDataDetail(userId,ticketId,activeName,ticketName);
return ResponseDto.success(sellDataDetailVO1);
SmileSellDataDetailVO smileSellDataDetailVO1 =smileFrontService.getSellDataDetail(userId,ticketId,activeName,ticketName);
return ResponseDto.success(smileSellDataDetailVO1);
}
@GetMapping("getCommission")
@ApiOperation("获取佣金明细")
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java
View file @ 140832fe
......@@ -3,7 +3,7 @@ package com.liquidnet.service.service.impl;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
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;
......@@ -64,7 +64,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
smileUserVO.getAreaId(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
smileUserVO.getIdCard(),smileUserVO.getSchoolName(),smileUserVO.getSchoolMajor(),smileUserVO.getIdentity(),smileUserVO.getTag(),smileUserVO.getAgent(),
smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
smileUserVO.getSpecialty3(),smileUserVO.getState(),smileUserVO.getDelTag(),smileUserVO.getCreatedDate(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId()
smileUserVO.getSpecialty3(),0,smileUserVO.getDelTag(),smileUserVO.getCreatedDate(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId()
});
String sqlDatas = SqlMapping.gets(sqls, sqlData);
......@@ -127,12 +127,12 @@ public class SmileFrontServiceImpl implements SmileFrontService {
}
@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());
public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName) {
SmileSellDataDetailVO smileSellDataDetailVO = mongoTemplate.findOne(Query.query(Criteria.where("dataId").is(agentId+ticketId)),
SmileSellDataDetailVO.class, SmileSellDataDetailVO.class.getSimpleName());
//把手机变为 ***
// 计算票的总量
List<Map> list=sellDataDetailVO.getList();
List<Map> list= smileSellDataDetailVO.getList();
int number=0;
for(Map a:list){
String mobile=a.get("mobile")==null?"":a.get("mobile").toString();
......@@ -149,12 +149,13 @@ public class SmileFrontServiceImpl implements SmileFrontService {
}
}
sellDataDetailVO.setCount(number);
sellDataDetailVO.setActiveName(activeName);
sellDataDetailVO.setTicketName(ticketName);
return sellDataDetailVO;
smileSellDataDetailVO.setCount(number);
smileSellDataDetailVO.setActiveName(activeName);
smileSellDataDetailVO.setTicketName(ticketName);
return smileSellDataDetailVO;
}
public void setUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
if(type.equals("1")){
redisVo.setImg(smileUserVO.getImg());
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileRedisUtils.java
View file @ 140832fe
......@@ -39,8 +39,8 @@ public class SmileRedisUtils {
redisUtil.set(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo),type);
}
/* ---------------------------------------- 销售数据 ---------------------------------------- */
public SellDataVO getSellDataVo(String userId,String performanceId){
return (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
public SmileSellDataVO getSellDataVo(String userId, String performanceId){
return (SmileSellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
}
/* ---------------------------------------- 佣金明细数据 ---------------------------------------- */
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/sqlmap.properties
View file @ 140832fe
#---- 服务支持信息
goblin_service_support.insert_byreplace=REPLACE INTO goblin_service_support (ssid,name,`desc`,url,del_flg,created_by,created_at)VALUES(?,?,?,?,'0','-',sysdate())
smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?)
smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
smile_service.update_user= update smile_user set img =?,`name`=?,birthday=?,sex =?,phone=?,province_key=?,province=?,city_key =?,city=?,area_key=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,auth_tag =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
smile_service.delete_user= delete from smile_user where uid=?
\ No newline at end of file
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