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

Skip to content

L
liquidnet-bus-v1
Commit 92699679 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !329
parents abb53648 4792f39e
Show whitespace changes
Inline Side-by-side
Showing with 153 additions and 33 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ 92699679
...@@ -489,7 +489,9 @@ ...@@ -489,7 +489,9 @@
// busiName = selectThreeName; // busiName = selectThreeName;
} }
if (typeOne == 2) { if (typeOne == 2) {
if (goodsId) {
useScope = 80; useScope = 80;
}
busiId = goodsId; busiId = goodsId;
busiName = $("#searchIpt2").val() || '全部商品'; busiName = $("#searchIpt2").val() || '全部商品';
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @ 92699679
...@@ -532,7 +532,9 @@ ...@@ -532,7 +532,9 @@
// busiName = selectThreeName; // busiName = selectThreeName;
} }
if (typeOne == 2) { if (typeOne == 2) {
if (goodsId) {
useScope = 80; useScope = 80;
}
busiId = goodsId; busiId = goodsId;
busiName = $("#searchIpt2").val() || '全部商品'; busiName = $("#searchIpt2").val() || '全部商品';
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/list.html
View file @ 92699679
...@@ -53,24 +53,22 @@ ...@@ -53,24 +53,22 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<!-- <div class="col-sm-12 search-collapse">--> <div class="col-sm-12 search-collapse">
<!-- <form id="formId">--> <form id="formId">
<!-- <div class="select-list">--> <div class="select-list">
<!-- <ul>--> <ul>
<!-- <li>--> <li>
<!-- <label>手机号：</label>--> <label>名称：</label>
<!-- <input type="text" name="activityTitle"/>--> <input type="text" name="name"/>
<!-- </li>--> </li>
<!-- <li>--> <li>
<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i--> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
<!-- class="fa fa-search"></i>&nbsp;搜索</a>--> class="fa fa-search"></i>&nbsp;搜索</a>
<!--&lt;!&ndash; <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i&ndash;&gt;--> </li>
<!--&lt;!&ndash; class="fa fa-refresh"></i>&nbsp;重置</a>&ndash;&gt;--> </ul>
<!-- </li>--> </div>
<!-- </ul>--> </form>
<!-- </div>--> </div>
<!-- </form>-->
<!-- </div>-->
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
......
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 @ 92699679
...@@ -35,6 +35,7 @@ import com.liquidnet.service.smile.entity.SmilePrice; ...@@ -35,6 +35,7 @@ import com.liquidnet.service.smile.entity.SmilePrice;
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.dto.ShowBaseVoDto; import com.liquidnet.service.smile.entity.dto.ShowBaseVoDto;
import com.liquidnet.service.smile.entity.dto.SmilePriceIdPhoneDao;
import com.liquidnet.service.smile.mapper.SmileAgentMapper; import com.liquidnet.service.smile.mapper.SmileAgentMapper;
import com.liquidnet.service.smile.mapper.SmilePriceMapper; import com.liquidnet.service.smile.mapper.SmilePriceMapper;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper; import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
...@@ -101,7 +102,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -101,7 +102,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
PageHelper.startPage(smileShowParam.getPageNum(), smileShowParam.getPageSize()); PageHelper.startPage(smileShowParam.getPageNum(), smileShowParam.getPageSize());
TableDataInfo rspData = new TableDataInfo(); TableDataInfo rspData = new TableDataInfo();
//查询所有代理的演出id //查询所有代理的演出id
List<KylinPerformancesDto> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent(); List<KylinPerformancesDto> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent(smileShowParam.getName());
List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformancesDto -> { List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformancesDto -> {
ShowVo vo = ShowVo.getNew().copy(kylinPerformancesDto); ShowVo vo = ShowVo.getNew().copy(kylinPerformancesDto);
Integer ordNum = kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformancesDto.getPerformancesId()); Integer ordNum = kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformancesDto.getPerformancesId());
...@@ -351,16 +352,15 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -351,16 +352,15 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
//创建list长度定位分组数量 //创建list长度定位分组数量
List<UserData> userDataList = new ArrayList<>(); List<UserData> userDataList = new ArrayList<>();
//已打款跳出循环,去打款表中获取打款记录 //已打款跳出循环,去打款表中获取打款记录
LambdaQueryWrapper<SmilePrice> lambdaQueryWrapper = Wrappers.lambdaQuery(SmilePrice.class); List<SmilePriceIdPhoneDao> smilePrices = smileUserMapper.selectPriceIdPhone(performancesId);
lambdaQueryWrapper.eq(SmilePrice::getPerformancesId, performancesId); for (SmilePriceIdPhoneDao smilePrice : smilePrices) {
lambdaQueryWrapper.isNotNull(SmilePrice::getUid);
lambdaQueryWrapper.eq(SmilePrice::getDelTag, 0);
List<SmilePrice> smilePrices = smilePriceMapper.selectList(lambdaQueryWrapper);
for (SmilePrice smilePrice : smilePrices) {
if (smilePrice.getRecord() != null && !"".equals(smilePrice.getRecord())) { if (smilePrice.getRecord() != null && !"".equals(smilePrice.getRecord())) {
UserData userData = JSON.parseObject(smilePrice.getRecord(), UserData.class); UserData userData = JSON.parseObject(smilePrice.getRecord(), UserData.class);
//保存打款标识 //保存打款标识
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, userData.getUid())); userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, userData.getUid()));
userData.setPhone(smilePrice.getPhone());
userData.setIdCard(smilePrice.getIdCard());
userData.setAgentName(smilePrice.getName());
userDataList.add(userData); userDataList.add(userData);
ids.add(userData.getUid()); ids.add(userData.getUid());
} }
...@@ -436,8 +436,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -436,8 +436,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userData.setUsername(showBaseVoDtoList.get(0).getName()); userData.setUsername(showBaseVoDtoList.get(0).getName());
userData.setCityName(showBaseVoDtoList.get(0).getCity()); userData.setCityName(showBaseVoDtoList.get(0).getCity());
userData.setType(showBaseVoDtoList.get(0).getType()); userData.setType(showBaseVoDtoList.get(0).getType());
userData.setPhone(showBaseVoList.get(0).getPhone()); userData.setPhone(showBaseVoDtoList.get(0).getPhone());
userData.setIdCard(showBaseVoList.get(0).getIdCard()); userData.setIdCard(showBaseVoDtoList.get(0).getIdCard());
userData.setState(showBaseVoDtoList.get(0).getState()); userData.setState(showBaseVoDtoList.get(0).getState());
if (userData.getType() != 2) { if (userData.getType() != 2) {
userData.setAgentName(showBaseVoDtoList.get(0).getName()); userData.setAgentName(showBaseVoDtoList.get(0).getName());
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ 92699679
...@@ -68,7 +68,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> { ...@@ -68,7 +68,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
List<KylinPerformances> selectByComment(); List<KylinPerformances> selectByComment();
List<KylinPerformancesDto> selectPerIdByAgent(); List<KylinPerformancesDto> selectPerIdByAgent(@Param("title") String title );
List<KylinPerformancesDao> selectTicketIdByPerId(@Param("performancesId") String performancesId); List<KylinPerformancesDao> selectTicketIdByPerId(@Param("performancesId") String performancesId);
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 92699679
...@@ -762,13 +762,17 @@ GROUP BY user_mobile,tickets_id; ...@@ -762,13 +762,17 @@ GROUP BY user_mobile,tickets_id;
GROUP BY GROUP BY
kk.performance_id kk.performance_id
) AS map ON map.performance_id = kp.performances_id ) AS map ON map.performance_id = kp.performances_id
WHERE <where>
kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent AS sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id ) kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent AS sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
<if test="title!=''">
AND kp.title LIKE concat('%', #{title}, '%')
</if>
</where>
GROUP BY GROUP BY
sa.performance_id sa.performance_id
ORDER BY ORDER BY
kp.COMMENT DESC, kp.COMMENT DESC,
kp.time_start DESC kp.title DESC
</select> </select>
<select id="getListAll" resultType="com.liquidnet.service.kylin.dao.report.KylinPerformancesDto"> <select id="getListAll" resultType="com.liquidnet.service.kylin.dao.report.KylinPerformancesDto">
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/SmilePriceIdPhoneDao.java 0 → 100644
View file @ 92699679
package com.liquidnet.service.smile.entity.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author liquidnet
* @since 2022-03-22
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SmilePriceIdPhoneDao implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 演出id
*/
private String performancesId;
/**
* 用户id
*/
private String uid;
/**
* 打款金额
*/
private BigDecimal price;
/**
* 打款记录保留
*/
private String record;
/**
* 打款标识0：未打款，1：已打款
*/
private Integer status;
/**
* 0：未删除，1：已删除
*/
private Integer delTag;
/**
* 证件号
*/
private String idCard;
/**
* 手机
*/
private String phone;
/**
* 总代名称
*/
private String name;
/**
* 创建时间
*/
private LocalDateTime createdDate;
/**
* 修改时间
*/
private LocalDateTime updatedDate;
private static final SmilePriceIdPhoneDao obj = new SmilePriceIdPhoneDao();
public static SmilePriceIdPhoneDao getNew() {
try {
return (SmilePriceIdPhoneDao) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmilePriceIdPhoneDao();
}
}
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java
View file @ 92699679
package com.liquidnet.service.smile.mapper; package com.liquidnet.service.smile.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.entity.dto.SmilePriceIdPhoneDao;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -45,4 +47,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> { ...@@ -45,4 +47,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
List<SmileUser> selectUidByPerId(@Param("performancesId") String performancesId); List<SmileUser> selectUidByPerId(@Param("performancesId") String performancesId);
List<SmileUser> selectUidByPerIdNotType(@Param("performancesId") String performancesId); List<SmileUser> selectUidByPerIdNotType(@Param("performancesId") String performancesId);
List<SmilePriceIdPhoneDao> selectPriceIdPhone(String performanceId);
} }
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml
View file @ 92699679
...@@ -202,4 +202,17 @@ ...@@ -202,4 +202,17 @@
</select> </select>
<select id="selectPriceIdPhone" resultType="com.liquidnet.service.smile.entity.dto.SmilePriceIdPhoneDao">
SELECT
a.*,b.id_card,b.phone,c.name
FROM
smile_price as a
inner join smile_user as b on a.uid = b.uid
inner join smile_user as c on b.agent_id = c.uid
WHERE
performances_id = #{performanceId}
AND a.uid IS NOT NULL
AND a.del_tag = 0
</select>
</mapper> </mapper>
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