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

Skip to content

L
liquidnet-bus-v1
Commit 5eb8a51c authored by qinshuangshuang's avatar qinshuangshuang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 55391639 468e6e71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 640 additions and 261 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/param/admin/MemberOrderListReq.java 0 → 100644
View file @ 5eb8a51c
package com.liquidnet.service.adam.dto.param.admin;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderListReq
* @Package com.liquidnet.service.adam.dto.param.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 18:18
*/
@Data
public class MemberOrderListReq {
/**
* 订单号
*/
private String orderNo;
/**
* 电话
*/
private String mobile;
/**
* 支付方式:alipay,wepay,vipcode,giftcode
*/
private String payType;
/**
* 订单状态:0未支付 1已支付 2已超时 5已退款
*/
private Integer state;
/**
* 购买方式:0-购买会员 1-购买会员码,2-使用会员码
*/
private String mode;
/**
* 购买来源 Android iOS h5
*/
private String source;
/**
* 支付开始时间
*/
private String paymentAtStart;
/**
* 支付结束时间
*/
private String paymentAtEnd;
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/MemberOrderDetailAdminVo.java 0 → 100644
View file @ 5eb8a51c
package com.liquidnet.service.adam.dto.vo.admin;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.entity.AdamUser;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderDetailAdminVo
* @Package com.liquidnet.service.adam.dto.vo.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 14:37
*/
@Data
public class MemberOrderDetailAdminVo {
private AdamMemberOrderVo adamMemberOrderVo;
private AdamUser adamUser;
private AdamUserInfoVo adamUserInfoVo;
private AdamUserMemberVo adamUserMemberVo;
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java
View file @ 5eb8a51c
package com.liquidnet.service.adam.service.admin; package com.liquidnet.service.adam.service.admin;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import java.util.List;
/** /**
* @author AnJiabin <anjiabin@zhengzai.tv> * @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0 * @version V1.0
...@@ -13,5 +18,7 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder; ...@@ -13,5 +18,7 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder;
* @date 2021/6/6 16:23 * @date 2021/6/6 16:23
*/ */
public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> { public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> {
List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq);
MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo);
} }
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java
View file @ 5eb8a51c
...@@ -114,6 +114,6 @@ public class KylinTicketPartnerVo implements Serializable { ...@@ -114,6 +114,6 @@ public class KylinTicketPartnerVo implements Serializable {
this.setIsTransfer(0); this.setIsTransfer(0);
this.setIsExclusive(0); this.setIsExclusive(0);
this.setSurplusExchange(this.getTotalExchange()); this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalExchange()); this.setSurplusGeneral(this.getTotalGeneral());
} }
} }
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java
View file @ 5eb8a51c
package com.liquidnet.client.admin.web.controller.zhengzai.adam; package com.liquidnet.client.admin.web.controller.zhengzai.adam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -44,10 +45,10 @@ public class AdamMemberOrderController extends BaseController ...@@ -44,10 +45,10 @@ public class AdamMemberOrderController extends BaseController
@RequiresPermissions("adam:order:orderlist:list") @RequiresPermissions("adam:order:orderlist:list")
@PostMapping("/orderList/list") @PostMapping("/orderList/list")
@ResponseBody @ResponseBody
public TableDataInfo list(AdamMemberOrder adamMemberOrder) public TableDataInfo list(MemberOrderListReq memberOrderListReq)
{ {
startPage(); startPage();
List<AdamMemberOrder> list = adamMemberOrderAdminService.list(); List<MemberOrderDto> list = adamMemberOrderAdminService.getMemberOrderList(memberOrderListReq);
return getDataTable(list); return getDataTable(list);
} }
...@@ -57,9 +58,7 @@ public class AdamMemberOrderController extends BaseController ...@@ -57,9 +58,7 @@ public class AdamMemberOrderController extends BaseController
@RequiresPermissions("adam:order:orderlist:detail") @RequiresPermissions("adam:order:orderlist:detail")
@GetMapping("/orderList/detail/{orderId}") @GetMapping("/orderList/detail/{orderId}")
public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) { public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {
LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper(); MemberOrderDetailAdminVo orderDetailsVo = adamMemberOrderAdminService.getMemberOrderDetail(orderId);
queryWrapper.eq(AdamMemberOrder::getOrderNo,orderId);
AdamMemberOrder orderDetailsVo = adamMemberOrderAdminService.getOne(queryWrapper);
mmap.put("orderDetailsVo", orderDetailsVo); mmap.put("orderDetailsVo", orderDetailsVo);
return prefix + "/orderList/detail"; return prefix + "/orderList/detail";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 5eb8a51c
...@@ -20,36 +20,36 @@ ...@@ -20,36 +20,36 @@
</li> </li>
<li> <li>
<label>支付方式：</label> <label>支付方式：</label>
<select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}"> <select name="payType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
<label>订单状态：</label> <label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}"> <select name="state" th:with="type=${@dict.getType('zhengzai_member_order_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
<label>购买方式：</label> <label>购买方式：</label>
<select name="buyMode" th:with="type=${@dict.getType('zhengzai_buy_mode')}"> <select name="mode" th:with="type=${@dict.getType('zhengzai_buy_mode')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
<label>客户端：</label> <label>客户端：</label>
<select name="orderSource" th:with="type=${@dict.getType('zhengzai_order_source')}"> <select name="source" th:with="type=${@dict.getType('zhengzai_order_source')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>支付时间： </label> <label>支付时间： </label>
<input type="text" class="time-input" id="timePayStart" placeholder="开始日期" name="params[beginTime]"/> <input type="text" class="time-input" id="timeStart" placeholder="开始日期" name="paymentAtStart"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="timePayEnd" placeholder="结束日期" name="params[endTime]"/> <input type="text" class="time-input" id="timeEnd" placeholder="结束日期" name="paymentAtEnd"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('adam:order:orderList')}]]; var detailFlag = [[${@permission.hasPermi('adam:order:orderList')}]];
var prefix = ctx + "adam/order/orderList"; var prefix = ctx + "adam/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_member_order_status')}]];
$(function() { $(function() {
var options = { var options = {
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
modalName: "【请填写功能名称】", modalName: "【请填写功能名称】",
columns: [{ columns: [{
checkbox: true checkbox: true
...@@ -101,7 +103,10 @@ ...@@ -101,7 +103,10 @@
}, },
{ {
field: 'state', field: 'state',
title: '订单状态' title: '订单状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
}, },
{ {
field: 'payType', field: 'payType',
...@@ -114,6 +119,9 @@ ...@@ -114,6 +119,9 @@
{ {
field: 'paymentAt', field: 'paymentAt',
title: '支付时间' title: '支付时间'
// formatter: function(value, row, index) {
// return [[${#dates.format(value, 'yyyy-MM-dd')}]];
// }
}, },
{ {
field: 'createdAt', field: 'createdAt',
...@@ -124,17 +132,17 @@ ...@@ -124,17 +132,17 @@
title: '用户ID' title: '用户ID'
}, },
{ {
field: 'memberPriceId', field: 'mobile',
title: '手机号' title: '手机号'
}, },
{ {
field: 'source', field: 'source',
title: '客户端' title: '客户端'
}, },
{ // {
field: 'state', // field: 'state',
title: '快递状态' // title: '快递状态'
}, // },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberAudit/edit.html
View file @ 5eb8a51c
...@@ -129,9 +129,16 @@ ...@@ -129,9 +129,16 @@
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize()); const auditStatus = document.getElementsByName("status")[0].checked ? 3 : 4;
if (4 === auditStatus) {
auditRejectTxt = document.getElementsByName("rejectTxt")[0].value;
}if (4 === auditStatus && auditRejectTxt === "") {
alert("请填写拒绝理由");
} else {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize());
}
} }
} }
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
View file @ 5eb8a51c
package com.liquidnet.client.admin.zhengzai.adam.service.impl; package com.liquidnet.client.admin.zhengzai.adam.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.entity.AdamUserInfo;
import com.liquidnet.service.adam.entity.AdamUserMember;
import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper; import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.beans.IntrospectionException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author AnJiabin <anjiabin@zhengzai.tv> * @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0 * @version V1.0
...@@ -17,4 +38,63 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +38,63 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService { public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService {
@Autowired
private AdamMemberOrderMapper adamMemberOrderMapper;
@Autowired
private AdamUserMemberMapper adamUserMemberMapper;
@Autowired
private AdamUserInfoMapper adamUserInfoMapper;
@Autowired
private AdamUserMapper adamUserMapper;
@Override
public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
Map<String, Object> reqParamMap = new HashMap<>();
try {
reqParamMap = BeanUtil.convertBeanToMap(memberOrderListReq,false);
} catch (IntrospectionException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
List<MemberOrderDto> list = adamMemberOrderMapper.getMemberOrderList(reqParamMap);
return list;
}
@Override
public MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo) {
MemberOrderDetailAdminVo detailAdminVo = new MemberOrderDetailAdminVo();
AdamMemberOrderVo adamMemberOrderVo = new AdamMemberOrderVo();
AdamUser adamUser = new AdamUser();
AdamUserInfoVo adamUserInfoVo = new AdamUserInfoVo();
AdamUserMemberVo adamUserMemberVo = new AdamUserMemberVo();
LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(AdamMemberOrder::getOrderNo,orderNo);
AdamMemberOrder adamMemberOrder = adamMemberOrderMapper.selectOne(queryWrapper);
BeanUtil.copy(adamMemberOrder,adamMemberOrderVo);
//获取用户会员信息
LambdaQueryWrapper<AdamUserMember> adamUserMemberWrapper = new LambdaQueryWrapper();
adamUserMemberWrapper.eq(AdamUserMember::getUid,adamMemberOrderVo.getUid());
AdamUserMember adamUserMember = adamUserMemberMapper.selectOne(adamUserMemberWrapper);
BeanUtil.copy(adamUserMember,adamUserMemberVo);
//获取用户信息表
LambdaQueryWrapper<AdamUserInfo> adamUserInfoWrapper = new LambdaQueryWrapper();
adamUserInfoWrapper.eq(AdamUserInfo::getUid,adamMemberOrderVo.getUid());
AdamUserInfo adamUserInfo = adamUserInfoMapper.selectOne(adamUserInfoWrapper);
BeanUtil.copy(adamUserInfo,adamUserInfoVo);
//获取用户表信息
LambdaQueryWrapper<AdamUser> adamUserWrapper = new LambdaQueryWrapper();
adamUserWrapper.eq(AdamUser::getUid,adamMemberOrderVo.getUid());
adamUser = adamUserMapper.selectOne(adamUserWrapper);
detailAdminVo.setAdamMemberOrderVo(adamMemberOrderVo);
detailAdminVo.setAdamUserMemberVo(adamUserMemberVo);
detailAdminVo.setAdamUserInfoVo(adamUserInfoVo);
detailAdminVo.setAdamUser(adamUser);
return detailAdminVo;
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @ 5eb8a51c
...@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
mapSql.put("status", 9); mapSql.put("status", 9);
mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus); performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus);
if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus()!=7) {//若 演出上 则 线判断状态 if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
performanceVoUtils.performanceVoStatus(performancesId); performanceVoUtils.performanceVoStatus(performancesId);
} }
} }
...@@ -202,7 +202,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -202,7 +202,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) { public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
List<PerformanceAdminListDao> newList = new ArrayList(); List<PerformanceAdminListDao> newList = new ArrayList();
try { try {
Map<String ,Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam); Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map); List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
for (PerformanceAdminListDao item : voList) { for (PerformanceAdminListDao item : voList) {
item.setStatus(item.getStatus()); item.setStatus(item.getStatus());
...@@ -331,13 +331,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -331,13 +331,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceMemberAuditDao.setIsExclusive(1); performanceMemberAuditDao.setIsExclusive(1);
} }
} }
PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName()); boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (memberAuditVo != null) { if (isExists) {
if (memberAuditVo.getStatus() == 1) {
performanceMemberAuditDao.setIsSubmit(1); performanceMemberAuditDao.setIsSubmit(1);
} else {
performanceMemberAuditDao.setIsSubmit(0);
}
} else { } else {
performanceMemberAuditDao.setIsSubmit(0); performanceMemberAuditDao.setIsSubmit(0);
} }
...@@ -347,9 +343,14 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -347,9 +343,14 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override @Override
public boolean performanceMemberChange(PerformanceMemberAuditParam performanceMemberAuditParam) { public boolean performanceMemberChange(PerformanceMemberAuditParam performanceMemberAuditParam) {
try { try {
performanceMemberAuditParam.setStatus(1); boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceMemberAuditParam.getPerformancesId())), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName()); if (isExists) {
return true; return false;
} else {
performanceMemberAuditParam.setStatus(1);
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName());
return true;
}
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }
...@@ -525,7 +526,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -525,7 +526,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public boolean changeSysDamai(List<SysDamaiParam> params) { public boolean changeSysDamai(List<SysDamaiParam> params) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String performancesId=""; String performancesId = "";
for (SysDamaiParam item : params) { for (SysDamaiParam item : params) {
if (item.getStatus() != 0 && item.getStatus() != 1) { if (item.getStatus() != 0 && item.getStatus() != 1) {
return false; return false;
...@@ -537,7 +538,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -537,7 +538,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
ticketStatus.setSyncDamai(item.getStatus()); ticketStatus.setSyncDamai(item.getStatus());
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId())); ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
} else if (item.getType().equals("performance")) { } else if (item.getType().equals("performance")) {
performancesId=item.getId(); performancesId = item.getId();
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setUpdatedAt(updatedAt); performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setSyncDamai(item.getStatus()); performanceStatus.setSyncDamai(item.getStatus());
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java
View file @ 5eb8a51c
...@@ -92,11 +92,11 @@ public class MongoVoUtils { ...@@ -92,11 +92,11 @@ public class MongoVoUtils {
kylinTicketVo.setTicketStatus(t2); kylinTicketVo.setTicketStatus(t2);
ticketList.add(kylinTicketVo); ticketList.add(kylinTicketVo);
// //票种 库存redis //票种 库存redis
// if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) { if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
// dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral()); dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
// dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange()); dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
// } }
if (kylinTicketVo.getIsMember() == 1) { if (kylinTicketVo.getIsMember() == 1) {
if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) { if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 5eb8a51c
...@@ -356,7 +356,6 @@ public class PerformanceVoUtils { ...@@ -356,7 +356,6 @@ public class PerformanceVoUtils {
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange()); dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral()); dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/dto/MemberOrderDto.java 0 → 100644
View file @ 5eb8a51c
package com.liquidnet.service.adam.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderDto
* @Package com.liquidnet.service.adam.dto
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 17:59
*/
@Data
public class MemberOrderDto {
private String uid;
private String orderNo;
private String state;
private String payType;
private BigDecimal price;
private BigDecimal pricePaid;
private String paymentAt;
private String createdAt;
private String mobile;
private String source;
private String mode;
}
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.java
View file @ 5eb8a51c
package com.liquidnet.service.adam.mapper; package com.liquidnet.service.adam.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import java.util.List;
import java.util.Map;
public interface AdamMemberOrderMapper extends BaseMapper<AdamMemberOrder> { public interface AdamMemberOrderMapper extends BaseMapper<AdamMemberOrder> {
List<MemberOrderDto> getMemberOrderList(Map<String, Object> map);
} }
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberMapper.xml
View file @ 5eb8a51c
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<result column="created_at" property="createdAt" /> <result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" /> <result column="updated_at" property="updatedAt" />
</resultMap> </resultMap>
<!-- sql --> <!-- sql -->
<select id="getFirstMember" resultMap="MemberResult"> <select id="getFirstMember" resultMap="MemberResult">
SELECT SELECT
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml 0 → 100644
View file @ 5eb8a51c
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.adam.mapper.AdamMemberOrderMapper">
<resultMap id="orderListResult" type="com.liquidnet.service.adam.dto.MemberOrderDto" >
<result column="uid" property="uid" />
<result column="order_no" property="orderNo" />
<result column="state" property="state" />
<result column="pay_type" property="payType" />
<result column="price" property="price" />
<result column="price_paid" property="pricePaid" />
<result column="payment_at" property="paymentAt" />
<result column="created_at" property="createdAt" />
<result column="mobile" property="mobile" />
<result column="source" property="source" />
<result column="mode" property="mode" />
</resultMap>
<select id="getMemberOrderList" resultMap="orderListResult">
select amo.uid,
amo.order_no,
amo.state,
amo.pay_type,
amo.price,
amo.price_paid,
amo.payment_at,
amo.created_at,
au.mobile,
amo.source,
amo.mode
from adam_member_order amo
inner join adam_user_member aum
on amo.uid = aum.uid
inner join adam_user au on aum.uid = au.uid
<where>
<if test="orderNo != null and orderNo != ''">
and amo.order_no = #{orderNo}
</if>
<if test="mobile != null and mobile != ''">
and au.mobile = #{mobile}
</if>
<if test="payType != null and payType != ''">
and amo.pay_type = #{payType}
</if>
<if test="state != null and state != ''">
and amo.state = #{state}
</if>
<if test="mode != null and mode != ''">
and amo.mode = #{mode}
</if>
<if test="source != null and source != ''">
and amo.source = #{source}
</if>
<if test="paymentAtStart != null and paymentAtStart != ''">
and amo.payment_at &gt; #{paymentAtStart}
</if>
<if test="paymentAtEnd != null and paymentAtEnd != ''">
and amo.payment_at &lt; #{paymentAtEnd}
</if>
</where>
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java
View file @ 5eb8a51c
...@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable { ...@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable {
* *
* @return * @return
*/ */
public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) { public Object[] getCloseOrderObject() {
return new Object[]{ return new Object[]{
status, updatedAt, orderId,updateTime,createTime status, updatedAt, orderId
}; };
} }
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ 5eb8a51c
...@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable { ...@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable {
* *
* @return * @return
*/ */
public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) { public Object[] getCloseOrderObject() {
return new Object[]{ return new Object[]{
updatedAt, orderTicketsId,updateTime,createTime updatedAt, orderTicketsId
}; };
} }
} }
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ 5eb8a51c
...@@ -417,6 +417,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -417,6 +417,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
return ResponseDto.success("保存成功"); return ResponseDto.success("保存成功");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20115)); return ResponseDto.failure(ErrorMapping.get(20115));
} }
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 5eb8a51c
...@@ -296,7 +296,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -296,7 +296,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==1){ if(performancePartnerVo.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20107)); return ResponseDto.failure(ErrorMapping.get(20107));
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ 5eb8a51c
...@@ -95,7 +95,7 @@ public class PerformanceVoTask { ...@@ -95,7 +95,7 @@ public class PerformanceVoTask {
List<String> performanceIdList = new ArrayList<>(); List<String> performanceIdList = new ArrayList<>();
if (performanceSingleId == null) { if (performanceSingleId == null) {
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9)); List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
for (KylinPerformanceStatus item : list) { for (KylinPerformanceStatus item : list) {
performanceIdList.add(item.getPerformanceId()); performanceIdList.add(item.getPerformanceId());
} }
...@@ -146,7 +146,7 @@ public class PerformanceVoTask { ...@@ -146,7 +146,7 @@ public class PerformanceVoTask {
} }
} }
if(kylinTicketVoItem.getStatus()==7){ if (kylinTicketVoItem.getStatus() == 7) {
status = 7; status = 7;
} }
...@@ -171,18 +171,18 @@ public class PerformanceVoTask { ...@@ -171,18 +171,18 @@ public class PerformanceVoTask {
} }
} }
} }
if(vo.getAppStatus()<=4){ if (vo.getAppStatus() <= 4) {
appStatus=vo.getAppStatus(); appStatus = vo.getAppStatus();
} }
if(vo.getAppStatus()==7){ if (vo.getAppStatus() == 7) {
appStatus=7; appStatus = 7;
} }
//修改演出状态 //修改演出状态
KylinPerformanceStatus changeStatus = new KylinPerformanceStatus(); KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
changeStatus.setStatus(appStatus); changeStatus.setStatus(appStatus);
performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId)); performanceStatusMapper.update(changeStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
vo.setAppStatus(appStatus); vo.setAppStatus(appStatus);
dataUtils.updatePerformanceMongo(performancesId,vo); dataUtils.updatePerformanceMongo(performancesId, vo);
} }
} }
...@@ -361,6 +361,9 @@ public class PerformanceVoTask { ...@@ -361,6 +361,9 @@ public class PerformanceVoTask {
ticketStatusMapper.insert(ticketStatus); ticketStatusMapper.insert(ticketStatus);
ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketRelations.getTicketId())); ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketRelations.getTicketId()));
ticketRelationsMapper.insert(ticketRelations); ticketRelationsMapper.insert(ticketRelations);
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
} }
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -369,42 +372,42 @@ public class PerformanceVoTask { ...@@ -369,42 +372,42 @@ public class PerformanceVoTask {
} }
public boolean judgeIsAudit(String performanceId){ public boolean judgeIsAudit(String performanceId) {
KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId); KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId); KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
if(!misVo.getTitle().equals(mongoVo.getTitle())){ if (!misVo.getTitle().equals(mongoVo.getTitle())) {
return true; return true;
}else if(!misVo.getType().equals(mongoVo.getType())){ } else if (!misVo.getType().equals(mongoVo.getType())) {
return true; return true;
}else if(!misVo.getTimeStart().equals(mongoVo.getTimeStart())){ } else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
return true; return true;
}else if(!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())){ } else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
return true; return true;
}else if(!misVo.getFieldId().equals(mongoVo.getFieldId())){ } else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
return true; return true;
}else if(!misVo.getNotice().equals(mongoVo.getNotice())){ } else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
return true; return true;
}else if(!misVo.getDetails().equals(mongoVo.getDetails())){ } else if (!misVo.getDetails().equals(mongoVo.getDetails())) {
return true; return true;
}else if(!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())){ } else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
return true; return true;
}else if(!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())){ } else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
return true; return true;
}else if(!misVo.getLimitCount().equals(mongoVo.getLimitCount())){ } else if (!misVo.getLimitCount().equals(mongoVo.getLimitCount())) {
return true; return true;
} else if(!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())){ } else if (!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())) {
return true; return true;
} }
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)),KylinTicketTimesPartnerVo.class,KylinTicketTimesPartnerVo.class.getSimpleName()); boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if(exists){ if (exists) {
return true; return true;
} }
for (int i = 0;i<misVo.getTicketTimes().size();i++){ for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i); TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())),KylinTicketPartnerVo.class,KylinTicketPartnerVo.class.getSimpleName()); boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if(exists2){ if (exists2) {
return true; return true;
} }
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties
View file @ 5eb8a51c
...@@ -24,8 +24,8 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay ...@@ -24,8 +24,8 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
# ------------------------订单关闭---------------------------- # ------------------------订单关闭----------------------------
kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?) kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?) kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?) kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?
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