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

Skip to content

L
liquidnet-bus-v1
Commit 409bae6a authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents add2c7d7 9ef580db
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 34 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 409bae6a
s<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('【请填写功能名称】列表')" /> <th:block th:include="include :: header('【请填写功能名称】列表')" />
...@@ -100,11 +100,11 @@ s<!DOCTYPE html> ...@@ -100,11 +100,11 @@ s<!DOCTYPE html>
title: '订单号' title: '订单号'
}, },
{ {
field: 'uid', field: 'state',
title: '订单状态' title: '订单状态'
}, },
{ {
field: 'mode', field: 'payType',
title: '支付方式' title: '支付方式'
}, },
{ {
...@@ -112,15 +112,15 @@ s<!DOCTYPE html> ...@@ -112,15 +112,15 @@ s<!DOCTYPE html>
title: '价格(元)' title: '价格(元)'
}, },
{ {
field: 'pricePaid', field: 'paymentAt',
title: '支付时间' title: '支付时间'
}, },
{ {
field: 'memberName', field: 'createdAt',
title: '创建时间' title: '创建时间'
}, },
{ {
field: 'memberId', field: 'uid',
title: '用户ID' title: '用户ID'
}, },
{ {
...@@ -128,7 +128,7 @@ s<!DOCTYPE html> ...@@ -128,7 +128,7 @@ s<!DOCTYPE html>
title: '手机号' title: '手机号'
}, },
{ {
field: 'days', field: 'source',
title: '客户端' title: '客户端'
}, },
{ {
...@@ -140,7 +140,7 @@ s<!DOCTYPE html> ...@@ -140,7 +140,7 @@ s<!DOCTYPE html>
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderNo + '\')"><i class="fa fa-search"></i>详细</a>');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 409bae6a
...@@ -107,6 +107,9 @@ ...@@ -107,6 +107,9 @@
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]]; var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var prefix = ctx + "kylin/order/orderList"; var prefix = ctx + "kylin/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]];
var payTypeDic = [[${@dict.getType('zhengzai_pay_type')}]];
$(function() { $(function() {
var options = { var options = {
...@@ -117,32 +120,45 @@ ...@@ -117,32 +120,45 @@
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{
field: '-',
title: '第三方'
},
{ {
field: 'orderCode', field: 'orderCode',
title: '订单号' title: '订单号'
}, },
{ {
field: 'performanceTitle', field: 'title',
title: '订单状态' title: '演出名称'
}, },
{ {
field: 'getTicketType', field: 'status',
title: '支付方式' title: '订单状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
}, },
{ {
field: 'getTicketType', field: 'getTicketType',
title: '取票方式' title: '取票方式',
formatter: function(value, row, index) {
return $.table.selectDictLabel(getTicketTypeDic, value);
}
}, },
{ {
field: 'paymentType', field: 'paymentType',
title: '支付方式' title: '支付方式'
// formatter: function(value, row, index) {
// return $.table.selectDictLabel(payTypeDic, value);
// }
}, },
{ {
field: 'userId', field: 'tied',
title: '搭售' title: '搭售'
}, },
{ {
field: 'userName', field: 'priceActual',
title: '总价格' title: '总价格'
}, },
{ {
...@@ -162,7 +178,7 @@ ...@@ -162,7 +178,7 @@
title: '手机号' title: '手机号'
}, },
{ {
field: 'qrCode', field: 'orderSource',
title: '客户端' title: '客户端'
}, },
{ {
......
liquidnet-bus-common/liquidnet-common-swagger/src/main/java/com/liquidnet/common/swagger/config/Swagger2Config.java
View file @ 409bae6a
package com.liquidnet.common.swagger.config; package com.liquidnet.common.swagger.config;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -14,11 +13,10 @@ import springfox.documentation.service.ApiInfo; ...@@ -14,11 +13,10 @@ import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact; import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
@Configuration @Configuration
@EnableKnife4j @EnableSwagger2WebMvc
@EnableSwagger2
public class Swagger2Config { public class Swagger2Config {
@Autowired @Autowired
private Environment environment; private Environment environment;
......
liquidnet-bus-common/pom.xml
View file @ 409bae6a
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId> <artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.0.4</version> <version>2.0.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.belerweb</groupId> <groupId>com.belerweb</groupId>
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml
View file @ 409bae6a
...@@ -11,6 +11,7 @@ server: ...@@ -11,6 +11,7 @@ server:
context-path: ${liquidnet.info.context} context-path: ${liquidnet.info.context}
# ----------------------------------------------------------- # -----------------------------------------------------------
knife4j: knife4j:
enable: true
production: ${liquidnet.knife4j.disable} production: ${liquidnet.knife4j.disable}
basic: basic:
enable: false enable: false
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml
View file @ 409bae6a
...@@ -11,6 +11,7 @@ server: ...@@ -11,6 +11,7 @@ server:
context-path: ${liquidnet.info.context} context-path: ${liquidnet.info.context}
# ----------------------------------------------------------- # -----------------------------------------------------------
knife4j: knife4j:
enable: true
production: ${liquidnet.knife4j.disable} production: ${liquidnet.knife4j.disable}
basic: basic:
enable: false enable: false
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @ 409bae6a
...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* <p> * <p>
...@@ -47,7 +48,15 @@ public class AdamEntersController { ...@@ -47,7 +48,15 @@ public class AdamEntersController {
@ApiOperation(value = "添加入场人") @ApiOperation(value = "添加入场人")
@PostMapping("add") @PostMapping("add")
public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) { public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
return ResponseDto.success(adamEntersService.add(parameter)); List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny();
if (any.isPresent()) {
return ResponseDto.failure(ErrorMapping.get("10019"));
}
String entersId = adamEntersService.add(parameter);
return ResponseDto.success(entersId);
} }
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 409bae6a
...@@ -154,11 +154,17 @@ public class AdamMemberOrderController { ...@@ -154,11 +154,17 @@ public class AdamMemberOrderController {
} }
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "兑换码校验") @ApiOperation(value = "兑换码校验", notes = "响应参数[`code`:0-当前兑换码可用，否则不可用]")
@GetMapping("check/code") @GetMapping("check/code")
public ResponseDto<Integer> checkMemberCode(@NotBlank @RequestParam String mCode) { public ResponseDto<Integer> checkMemberCode(@NotBlank @RequestParam String mCode) {
AdamMemberCodeVo vo = adamRdmService.getMemberCodeVoByCode(mCode); AdamMemberCodeVo vo = adamRdmService.getMemberCodeVoByCode(mCode);
return ResponseDto.success(null == vo ? -1 : vo.getState()); if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("10207"));
}
if (vo.getState() != 0) {
return ResponseDto.failure(ErrorMapping.get(vo.getState() == 1 ? "10208" : "10209"));
}
return ResponseDto.success();
} }
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 409bae6a
...@@ -3,11 +3,16 @@ package com.liquidnet.service.adam.controller; ...@@ -3,11 +3,16 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.constant.LnsRegex; import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.dto.AdamThirdPartParam; import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.AdamUserInfoParam; import com.liquidnet.service.adam.dto.AdamUserInfoParam;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.*; import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -27,7 +32,6 @@ import javax.validation.Valid; ...@@ -27,7 +32,6 @@ import javax.validation.Valid;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@ApiSupport(order = 10020) @ApiSupport(order = 10020)
@Api(tags = "用户中心") @Api(tags = "用户中心")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @ 409bae6a
...@@ -44,7 +44,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -44,7 +44,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName()); AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) { if (null != vo) {
val = vo.getMobile(); val = vo.getUid();
redisUtil.set(key, vo.getUid()); redisUtil.set(key, vo.getUid());
} }
} }
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties
View file @ 409bae6a
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
10016=收货地址ID不能为空 10016=收货地址ID不能为空
10017=入场人不存在，请核实 10017=入场人不存在，请核实
10018=收货地址不存在，请核实 10018=收货地址不存在，请核实
10019=入场人已存在，请核实
10101=姓名或身份证件号无效 10101=姓名或身份证件号无效
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 409bae6a
...@@ -1002,9 +1002,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1002,9 +1002,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
@Override @Override
public boolean checkOrderTime(String userId) { public boolean checkOrderTime(String userId) {
List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId); List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
LinkedList<String> sqls = new LinkedList<>();
HashMap<String, Integer> map2 = new HashMap<>(); HashMap<String, Integer> map2 = new HashMap<>();
for (OrderScriptDto item : dtoData) { for (OrderScriptDto item : dtoData) {
LinkedList<String> sqls = new LinkedList<>();
String lock = "order_lock:" + item.getOrderCode(); String lock = "order_lock:" + item.getOrderCode();
// if (!redisLockUtil.tryLock(lock, 30, 240)) { // if (!redisLockUtil.tryLock(lock, 30, 240)) {
// continue; // continue;
...@@ -1013,10 +1013,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1013,10 +1013,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
try { try {
KylinOrderTicketVo vo = mongoTemplate.findOne( KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
Query.query(Criteria.where("orderTicketsId").is(item.getOrderTicketsId())),
KylinOrderTicketVo.class,
KylinOrderTicketVo.class.getSimpleName());
if (vo.getStatus() != 0) { if (vo.getStatus() != 0) {
continue; continue;
} }
...@@ -1053,7 +1050,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1053,7 +1050,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
// List<KylinOrderTicketEntities> entities = entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId())); // List<KylinOrderTicketEntities> entities = entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList(); List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList();
entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId())); // entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
KylinOrderTicketEntitiesVo items = entities.get(i); KylinOrderTicketEntitiesVo items = entities.get(i);
dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1); dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
......
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