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

Skip to content

L
liquidnet-bus-v1
Commit 52a92f25 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 admin

parent 78be7351
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 47 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/ImportController.java
View file @ 52a92f25
......@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
......@@ -19,7 +20,7 @@ import java.util.List;
@Controller
@RequestMapping("/import")
public class ImportController {
public class ImportController extends BaseController {
private String prefix = "zhengzai/kylin/performances/orderImport";
......@@ -46,7 +47,7 @@ public class ImportController {
ExcelUtil<OrderOutLineVo> util = new ExcelUtil(OrderOutLineVo.class);
List<OrderOutLineVo> orderOutLineVoList = util.importExcel(file.getInputStream());
// String operName = ShiroUtils.getSysUser().getLoginName();
String message = iImportService.importOrderOutLine(performancesId, orderOutLineVoList, updateSupport, file.getName());
String message = iImportService.importOrderOutLine(performancesId, orderOutLineVoList, updateSupport, file.getOriginalFilename());
return AjaxResult.success(message);
}
......@@ -54,7 +55,6 @@ public class ImportController {
* 跳转导入详情
*/
@GetMapping("OrderOutLine/detailsList/{id}")
@ResponseBody
public String detailsList(@PathVariable("id") String importId, ModelMap mmap) {
mmap.put("importId", importId);
return prefix + "/details";
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @ 52a92f25
......@@ -204,7 +204,8 @@ public class KylinPerformancesController extends BaseController {
@RequestParam("isRefundPoundage") Integer isRefundPoundage,
@RequestParam("isRefundVoucher") Integer isRefundVoucher,
@RequestParam("isRefundExpress") Integer isRefundExpress) {
String result = kylinPerformancesService.changeRefundConfig(performancesId,isCanRefund,refundOpenTime,refundCloseTime,isRefundPoundage,isRefundVoucher,isRefundExpress); return this.success(result);
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress);
return this.success(result);
}
@GetMapping(value = "/transferConfig/{performancesId}")
......@@ -216,10 +217,6 @@ public class KylinPerformancesController extends BaseController {
@GetMapping(value = "/orderImport/{performancesId}")
public String getOrderImport(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
// List<KylinOrderImport> result = kylinPerformancesService.getOrderImport(performancesId);
// KylinOrderImportDto vo = new KylinOrderImportDto();
// vo.setKylinOrderImportList(result);
// vo.setPerformancesId(performancesId);
mmap.put("performancesId", performancesId);
return prefix + "/orderImport";
}
......@@ -227,15 +224,11 @@ public class KylinPerformancesController extends BaseController {
@PostMapping(value = "/orderImport/list/{performancesId}")
@ResponseBody
public TableDataInfo getOrderImportList(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
startPage();
List<KylinOrderImport> result = kylinPerformancesService.getOrderImport(performancesId);
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
rspData.setRows(result);
rspData.setTotal(result.size());
return rspData;
return getDataTable(result);
}
//@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/transferConfig/change")
@ResponseBody
public AjaxResult changeTransferConfig(@RequestParam("performancesId") String performancesId,
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/orderImport.html
View file @ 52a92f25
......@@ -25,6 +25,7 @@
<script th:inline="javascript">
var prefix = ctx + "kylin/performances";
var importfix = ctx + "import/";
var importStatusDic = [[${@dict.getType('zhengzai_import_status')}]];
var options = {
url: prefix + "/orderImport/list/" + '[[${performancesId}]]'.replaceAll("\"", ""),
importUrl: importfix + "OrderOutLine/"+ '[[${performancesId}]]'.replaceAll("\"", ""),//导入
......@@ -37,7 +38,7 @@
checkbox: true
},
{
field: 'mid',
field: 'importId',
title: 'id'
},
{
......@@ -46,7 +47,10 @@
},
{
field: 'status',
title: '订单状态'
title: '订单状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(importStatusDic, value);
}
},
{
field: 'allCount',
......@@ -73,7 +77,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mid + '\')"><i class="fa fa-edit"></i>详情</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.importId + '\')"><i class="fa fa-edit"></i>错误详情</a> ');
return actions.join('');
}
}]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/orderImport/details.html
View file @ 52a92f25
......@@ -16,7 +16,7 @@
var prefix = ctx + "import/";
$(function () {
var options = {
url: prefix + "/OrderOutLine/details/" + '[[${importId}]]'.replaceAll("\"", ""),
url: prefix + "OrderOutLine/details/" + '[[${importId}]]'.replaceAll("\"", ""),
modalName: "导入详情",
method: "get",
columns: [{
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html
View file @ 52a92f25
......@@ -38,7 +38,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">手续费：</label>
<div class="col-sm-8" th:if="*{isRefundPoundage==1}">
<div class="radio check-box">
......@@ -57,7 +57,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">退优惠券：</label>
<div class="col-sm-8" th:if="*{isRefundVoucher==1}">
<div class="radio check-box">
......@@ -76,7 +76,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">快递费：</label>
<div class="col-sm-8" th:if="*{isRefundExpress==1}">
<div class="radio check-box">
......@@ -95,19 +95,19 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label">收货人：</label>
<div class="col-sm-8">
<input name="title" th:field="*{orderRefundAddress.name}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label">电话：</label>
<div class="col-sm-8">
<input name="title" th:field="*{orderRefundAddress.phone}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label">收货地址：</label>
<div class="col-sm-8">
<input name="title" th:field="*{orderRefundAddress.address}" class="form-control" type="text" readonly>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ImportServiceImpl.java
View file @ 52a92f25
......@@ -21,12 +21,12 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.math.BigDecimal;
......@@ -36,6 +36,7 @@ import java.util.ArrayList;
import java.util.List;
@Service
@Slf4j
public class ImportServiceImpl implements IImportService {
@Autowired
......@@ -92,22 +93,20 @@ public class ImportServiceImpl implements IImportService {
String enterMobile = orderOutLineVo.getEnterMobile();
String enterIdCode = orderOutLineVo.getEnterIdCode();
String enterName = orderOutLineVo.getEnterName();
Integer number = 1;
int number = 1;
String address = orderOutLineVo.getAddress();
MultiValueMap<String, String> params = new LinkedMultiValueMap();
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("mobile", enterMobile);
MultiValueMap<String, String> headers = new LinkedMultiValueMap();
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers);
log.info("url = " + adamUrl.concat("/adam/rsc/reg/mobile"));
// String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers);
String returnData = HttpUtil.post("http://testadam.zhengzai.tv".concat("/adam/rsc/reg/mobile"), params, headers);
log.info("url = " + adamUrl.concat("/adam/rsc/reg/mobile"));
AdamUserInfoVo adamUserInfoVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserInfoVo>>() {
}).getData();
String uid = adamUserInfoVo.getUid();
Boolean isMember;
if (adamUserInfoVo.getStageMarker().equals("10") || adamUserInfoVo.getStageMarker().equals("11")) {
isMember = true;
} else {
isMember = false;
}
boolean isMember = false;
//找到对应票种和场次
String ticketTitle = orderOutLineVo.getTicketTitle();
String startTime = orderOutLineVo.getUseStart();
......@@ -140,6 +139,7 @@ public class ImportServiceImpl implements IImportService {
// return "演出数据错误";
orderOutLineVo.setReason("演出数据错误");
vos.add(orderOutLineVo);
failureNum++;
continue;
}
// 获取限购 实名
......@@ -160,6 +160,7 @@ public class ImportServiceImpl implements IImportService {
if (address.isEmpty()) {
orderOutLineVo.setReason("快递票未填写收货地址");
vos.add(orderOutLineVo);
failureNum++;
continue;
}
}
......@@ -167,6 +168,7 @@ public class ImportServiceImpl implements IImportService {
if (isTrueName == 1 && (enterIdCode.isEmpty() || enterName.isEmpty())) {
orderOutLineVo.setReason("实名票未填写入场人");
vos.add(orderOutLineVo);
failureNum++;
continue;
}
......@@ -177,6 +179,7 @@ public class ImportServiceImpl implements IImportService {
if (age > 25) {
orderOutLineVo.setReason("年龄不符合");
vos.add(orderOutLineVo);
failureNum++;
continue;
}
}
......@@ -188,6 +191,7 @@ public class ImportServiceImpl implements IImportService {
if (!res1.equals("")) {
orderOutLineVo.setReason(res1);
vos.add(orderOutLineVo);
failureNum++;
continue;
}
} else {
......@@ -195,31 +199,34 @@ public class ImportServiceImpl implements IImportService {
if (!res1.equals("")) {
orderOutLineVo.setReason(res1);
vos.add(orderOutLineVo);
failureNum++;
continue;
}
}
try {
order(number, ticketType.equals("express") ? 1 : 0, adamUserInfoVo, isMember, performanceData, ticketTimesData, ticketData, enterMobile, enterName, enterIdCode, address);
successNum++;
orderOutLineVo.setReason("成功");
// vos.add(orderOutLineVo);
} catch (Exception e) {
e.printStackTrace();
failureNum++;
}
}
KylinOrderImport orderImportFinal = new KylinOrderImport();
KylinOrderImport orderImportFinal = KylinOrderImport.getNew();
orderImportFinal.setPerformanceId(performancesId);
orderImportFinal.setStatus(1);
orderImportFinal.setAllCount(failureNum+successNum);
orderImportFinal.setAllCount(failureNum + successNum);
orderImportFinal.setErrorCount(failureNum);
orderImportFinal.setSuccessCount(successNum);
orderImportFinal.setUpdatedAt(LocalDateTime.now());
orderImportMapper.update(orderImportFinal, Wrappers.lambdaUpdate(KylinOrderImport.class).eq(KylinOrderImport::getImportId,importId));
orderImportMapper.update(orderImportFinal, Wrappers.lambdaUpdate(KylinOrderImport.class).eq(KylinOrderImport::getImportId, importId));
dataUtils.setOrderImportFail(importId,vos);
dataUtils.setOrderImportFail(importId, vos);
if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new BusinessException(failureMsg.toString());
// throw new BusinessException(failureMsg.toString());
} else {
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
}
......@@ -234,7 +241,7 @@ public class ImportServiceImpl implements IImportService {
private void order(Integer number, Integer IsExpress, AdamUserInfoVo adamUserInfoVo, boolean isMember,
KylinPerformanceVo performanceData, KylinTicketTimesVo ticketTimesVo, KylinTicketVo ticketData,
String enterMobile, String enterName, String enterIdCode, String address){
String enterMobile, String enterName, String enterIdCode, String address) {
String source = "OUTLINE";
String version = "OUTLINE";
LocalDateTime now = LocalDateTime.now();
......@@ -410,5 +417,4 @@ public class ImportServiceImpl implements IImportService {
}
}
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 @ 52a92f25
......@@ -605,7 +605,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
public List<KylinOrderImport> getOrderImport(String performanceId) {
return orderImportMapper.selectList(Wrappers.lambdaQuery(KylinOrderImport.class).eq(KylinOrderImport::getPerformanceId, performanceId));
return orderImportMapper.selectList(Wrappers.lambdaQuery(KylinOrderImport.class).eq(KylinOrderImport::getPerformanceId, performanceId)
.orderByDesc(KylinOrderImport::getCreatedAt));
}
@Override
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
View file @ 52a92f25
......@@ -415,7 +415,7 @@ public class DataUtils {
String redisKey = KylinRedisConst.ORDER_IMPORT_FAIL.concat(importId);
PageInfo<OrderOutLineVo> vo = new PageInfo(vos);
vo.setTotal(vos.size());
redisUtil.set(redisKey, vos);
redisUtil.set(redisKey, vo);
}
//获取 订单导入错误数据
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderImport.java
View file @ 52a92f25
......@@ -9,7 +9,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
@Data
public class KylinOrderImport implements Serializable {
public class KylinOrderImport implements Serializable,Cloneable {
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
......@@ -60,4 +60,14 @@ public class KylinOrderImport implements Serializable {
* comment
*/
private String comment;
private static final KylinOrderImport obj = new KylinOrderImport();
public static KylinOrderImport getNew() {
try {
return (KylinOrderImport) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new KylinOrderImport();
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java
View file @ 52a92f25
......@@ -57,8 +57,7 @@ public class AdamRscController {
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
log.info(UserPathDto.setData("已注册", mobile, uid));
}
AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(userInfoVo.getUid());
return ResponseDto.success(userInfoVo.rating(userMemberVo));
return ResponseDto.success(userInfoVo);
}
@ApiOperationSupport(order = 20)
......
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