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

Commit 6c9896bd authored by GaoHu's avatar GaoHu

新增特邀代理,修改票提查询sql

parent b2bf2ace
...@@ -104,8 +104,7 @@ public class SmileUserController extends BaseController { ...@@ -104,8 +104,7 @@ public class SmileUserController extends BaseController {
@ResponseBody @ResponseBody
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
public AjaxResult saveInvitedAgent(SmileUserInvitedVo smileUserInvitedVo) { public AjaxResult saveInvitedAgent(SmileUserInvitedVo smileUserInvitedVo) {
// iSmileUserService.saveInvitedAgent(smileUserInvitedVo); return iSmileUserService.saveInvitedAgent(smileUserInvitedVo);
return AjaxResult.success();
} }
......
...@@ -12,11 +12,14 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService; ...@@ -12,11 +12,14 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils; import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.smile.entity.SmileAgent;
import com.liquidnet.service.smile.entity.SmileOrganization; import com.liquidnet.service.smile.entity.SmileOrganization;
import com.liquidnet.service.smile.entity.SmileSchool; import com.liquidnet.service.smile.entity.SmileSchool;
import com.liquidnet.service.smile.entity.SmileUser; import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao; import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import com.liquidnet.service.smile.mapper.SmileAgentMapper;
import com.liquidnet.service.smile.mapper.SmileOrganizationMapper; import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper; import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper; import com.liquidnet.service.smile.mapper.SmileUserMapper;
...@@ -48,6 +51,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -48,6 +51,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
@Autowired @Autowired
SmileSchoolMapper smileSchoolMapper; SmileSchoolMapper smileSchoolMapper;
@Autowired
SmileAgentMapper smileAgentMapper;
@Override @Override
public TableDataInfo userList(SmileUserParam smileUserParam) { public TableDataInfo userList(SmileUserParam smileUserParam) {
PageInfo<SmileUser> pageInfo; PageInfo<SmileUser> pageInfo;
...@@ -221,7 +227,16 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -221,7 +227,16 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
smileUser.setIntroduce(smileUserInvitedVo.getDescribe()); smileUser.setIntroduce(smileUserInvitedVo.getDescribe());
smileUser.setDelTag(0); smileUser.setDelTag(0);
smileUser.setType(5); smileUser.setType(5);
smileUser.setAgent(1);
int insert = smileUserMapper.insert(smileUser); int insert = smileUserMapper.insert(smileUser);
//票提新增
SmileAgent smileAgent = SmileAgent.getNew();
smileAgent.setPerformanceId(smileUserInvitedVo.getPerformancesId());
smileAgent.setTicketId(uid);
smileAgent.setTotalCarry(ticket);
smileAgent.setOrdCarry(BigDecimal.ZERO);
smileAgent.setDelTag(0);
smileAgentMapper.insert(smileAgent);
if (insert > 0) { if (insert > 0) {
//新增缓存 //新增缓存
SmileUserVO smileUserVO = new SmileUserVO(); SmileUserVO smileUserVO = new SmileUserVO();
...@@ -232,9 +247,14 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -232,9 +247,14 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
smileUserVO.setIntroduce(smileUser.getIntroduce()); smileUserVO.setIntroduce(smileUser.getIntroduce());
smileUserVO.setType(5); smileUserVO.setType(5);
smileUserVO.setAgentId(uid); smileUserVO.setAgentId(uid);
smileUserVO.setAgent(1);
smileRedisUtils.setSmileUserVo(uid, smileUserVO); smileRedisUtils.setSmileUserVo(uid, smileUserVO);
SmileAgentVo smileAgentVo = SmileAgentVo.getNew();
BeanUtils.copyProperties(smileAgent, smileAgentVo);
smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
return AjaxResult.success();
} }
return null; return AjaxResult.warn("添加失败,请联系管理员!");
} }
private void updateUserVoRedis(SmileUserCheckVo smileUserCheckVo, SmileOrganization smileOrganization) { private void updateUserVoRedis(SmileUserCheckVo smileUserCheckVo, SmileOrganization smileOrganization) {
......
...@@ -58,4 +58,14 @@ public class SmileAgent implements Serializable { ...@@ -58,4 +58,14 @@ public class SmileAgent implements Serializable {
public BigDecimal getOrdCarry() { public BigDecimal getOrdCarry() {
return ordCarry; return ordCarry;
} }
private static final SmileAgent obj = new SmileAgent();
public static SmileAgent getNew() {
try {
return (SmileAgent) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmileAgent();
}
}
} }
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
sa.total_carry, sa.total_carry,
kt.title ticket_name kt.title ticket_name
FROM smile_agent sa FROM smile_agent sa
LEFT JOIN kylin_tickets kt ON kt.tickets_id = sa.ticket_id INNER JOIN kylin_tickets kt ON kt.tickets_id = sa.ticket_id
WHERE sa.performance_id = #{performancesId} WHERE sa.performance_id = #{performancesId}
AND sa.del_tag = 0 AND sa.del_tag = 0
</select> </select>
......
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