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

Skip to content

L
liquidnet-bus-v1
Commit c3a0373d authored by anjiabin's avatar anjiabin
Browse files
Options

Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

parents 395f93aa 765cf204
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 472 additions and 297 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressSearchAdminParam.java
View file @ c3a0373d
......@@ -22,6 +22,7 @@ public class PerformanceExpressSearchAdminParam {
private String orderStatus;
private String userMobile;
private String userName;
private String expressStatus;
private String expressContacts;
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderRefundEntitiesVo.java
View file @ c3a0373d
package com.liquidnet.service.kylin.dto.vo.mongo;
import com.liquidnet.service.kylin.entity.KylinCheckUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -9,7 +10,7 @@ import java.time.LocalDateTime;
@ApiModel
@Data
public class KylinOrderRefundEntitiesVo {
public class KylinOrderRefundEntitiesVo implements Cloneable {
private Integer mid;
private String orderRefundsEntitiesId;
private String orderRefundsId;
......@@ -17,4 +18,13 @@ public class KylinOrderRefundEntitiesVo {
private BigDecimal refundPrice;
private String createdAt;
private String updatedAt;
private static final KylinOrderRefundEntitiesVo obj = new KylinOrderRefundEntitiesVo();
public static KylinOrderRefundEntitiesVo getNew() {
try {
return (KylinOrderRefundEntitiesVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefundEntitiesVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java
View file @ c3a0373d
......@@ -26,7 +26,7 @@ import java.util.List;
@Data
@ApiModel
public class KylinOrderRefundsVo implements Serializable {
public class KylinOrderRefundsVo implements Serializable,Cloneable {
@ApiModelProperty(value = "主键ID")
private String orderRefundsId;
......@@ -162,4 +162,13 @@ public class KylinOrderRefundsVo implements Serializable {
}
}
private static final KylinOrderRefundsVo obj = new KylinOrderRefundsVo();
public static KylinOrderRefundsVo getNew() {
try {
return (KylinOrderRefundsVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefundsVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketEntitiesPreRefundVo.java
View file @ c3a0373d
......@@ -22,4 +22,13 @@ public class KylinOrderTicketEntitiesPreRefundVo implements Serializable, Clonea
private BigDecimal priceCanRefund;
private String ticketTitle;
private Integer isPayment;
private static final KylinOrderTicketEntitiesPreRefundVo obj = new KylinOrderTicketEntitiesPreRefundVo();
public static KylinOrderTicketEntitiesPreRefundVo getNew() {
try {
return (KylinOrderTicketEntitiesPreRefundVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketEntitiesPreRefundVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java
View file @ c3a0373d
......@@ -16,7 +16,7 @@ import java.util.List;
@ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
@Data
public class KylinOrderTicketPreVo implements Serializable {
public class KylinOrderTicketPreVo implements Serializable,Cloneable{
private Integer mid;
private static final long serialVersionUID = 5325511589667456213L;
@ApiModelProperty(position = 10, value = "ID")
......@@ -51,4 +51,13 @@ public class KylinOrderTicketPreVo implements Serializable {
private String fieldName;
private Integer isTrueName;
private List<KylinOrderTicketEntitiesPreRefundVo> entitiesPreRefundVos;
private static final KylinOrderTicketPreVo obj = new KylinOrderTicketPreVo();
public static KylinOrderTicketPreVo getNew() {
try {
return (KylinOrderTicketPreVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketPreVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
View file @ c3a0373d
package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.entity.KylinFields;
import lombok.Data;
import java.util.List;
@Data
public class OrderDetailsVo {
public class OrderDetailsVo implements Cloneable{
private KylinOrderTicketVo orderTicketVo;
private String enterDescribe;
private Integer expressStatus;
private Long restTime;
private Integer isCanRefund;
private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;
private static final OrderDetailsVo obj = new OrderDetailsVo();
public static OrderDetailsVo getNew() {
try {
return (OrderDetailsVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new OrderDetailsVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderRefundListVo.java
View file @ c3a0373d
......@@ -5,10 +5,19 @@ import lombok.Data;
import java.math.BigDecimal;
@Data
public class OrderRefundListVo {
public class OrderRefundListVo implements Cloneable{
private String orderRefundsId;
private String orderRefundCode;
private Integer status;
private BigDecimal price;
private Integer isMine;
private static final OrderRefundListVo obj = new OrderRefundListVo();
public static OrderRefundListVo getNew() {
try {
return (OrderRefundListVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new OrderRefundListVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderRefundVo.java
View file @ c3a0373d
......@@ -4,7 +4,16 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import lombok.Data;
@Data
public class OrderRefundVo {
public class OrderRefundVo implements Cloneable{
private KylinOrderTicketVo orderTicketVo;
private KylinOrderRefundsVo kylinOrderRefundsVoBaseList;
private static final OrderRefundVo obj = new OrderRefundVo();
public static OrderRefundVo getNew() {
try {
return (OrderRefundVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new OrderRefundVo();
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java
View file @ c3a0373d
......@@ -5,7 +5,6 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.OrderExpressListDao;
import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js
View file @ c3a0373d
......@@ -228,7 +228,7 @@ var table = {
});
// 加载成功、选中、取消、全部选中、全部取消（事件）
$(optionsIds).on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table", function () {
var toolbar = table.options.toolbar;
var toolbar = table.options.toolbar;
var uniqueId = table.options.uniqueId;
// 工具栏按钮控制
var rows = $.common.isEmpty(uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(uniqueId);
......@@ -1037,9 +1037,13 @@ var table = {
});
},
// 批量删除信息
removeAll: function(message, url) {
removeAll: function(message, url, uniqueId) {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (uniqueId) {
var rows = $.table.selectColumns(uniqueId);
} else {
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
}
message = message ?? "确认要删除选中的" + rows.length + "条数据吗?";
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ c3a0373d
......@@ -29,11 +29,11 @@
</li>
<li>
<label>收货人电话：</label>
<input type="text" name="expressContacts"/>
<input type="text" name="expressPhone"/>
</li>
<li>
<label>收货人姓名：</label>
<input type="text" name="expressPhone"/>
<input type="text" name="expressContacts"/>
</li>
<li>
<label>订单状态：</label>
......@@ -61,6 +61,21 @@
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success multiple disabled" onclick="$.operate.removeAll('确定下单吗？', '/kylin/performancesExpress/placeOrder')"
shiro:hasPermission="kylin:performancesExpress:placeOrder">
批量下单
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消吗？', '/kylin/performancesExpress/cancelOrder', 'orderExpressId')"
shiro:hasPermission="kylin:performancesExpress:cancelOrder">
批量取消
</a>
<a class="btn btn-info multiple disabled" onclick="$.operate.removeAll('确定打印吗？', '/kylin/performancesExpress/printExpress', 'orderExpressId')"
shiro:hasPermission="kylin:performancesExpress:printExpress">
批量打印
</a>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
......@@ -325,14 +340,14 @@
columns: [{
checkbox: true
},
{
field: 'orderExpressId',
title: '快递ID'
},
{
field: 'orderTicketsId',
title: '订单ID'
},
{
field: 'orderExpressId',
title: '快递ID'
},
{
field: 'orderCode',
title: '订单编号'
......@@ -426,7 +441,7 @@
actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
// actions.push('<a class="btn btn-warning btn-xs ' + generateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.orderExpressId + '\',)"></i>下载快递单</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + printExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.orderExpressId + '\',)"></i>打印快递单</a> ');
actions.push('<a class="btn btn-info btn-xs ' + printExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.orderExpressId + '\',)"></i>打印快递单</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @ c3a0373d
......@@ -246,7 +246,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT};
break;
case "approved":
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
break;
case "reject":
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundExecuteServiceImpl.java
View file @ c3a0373d
......@@ -111,7 +111,7 @@ public class KylinRefundExecuteServiceImpl {
case "review":
if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) { // 通过申请
type = "approved";
whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
}
if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { // 驳回申请
type = "reject";
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @ c3a0373d
......@@ -141,6 +141,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto placeOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer idCount = ids.size();
for (String orderTicketsId : ids) {
// 已经存在未取消的下单数据过滤掉
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
......@@ -161,7 +162,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
Wrappers.lambdaQuery(KylinOrderTicketRelations.class).eq(KylinOrderTicketRelations::getOrderId, orderTicketsId)
);
if (orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS1 && orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS6) {
return ResponseDto.failure("当前状态不能下单");
if (idCount > 1) {
continue;
} else {
return ResponseDto.failure("当前状态不能下单");
}
}
// 生成预快递单 防止因失败没办法再次发起也不能主动获取数据
KylinOrderExpress kylinOrderExpressPre = new KylinOrderExpress();
......@@ -217,7 +222,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
} else {
msg = (String) hashMap.get("msg");
}
return ResponseDto.failure(msg);
if (idCount > 1) {
continue;
} else {
return ResponseDto.failure(msg);
}
} else {
HashMap hashMapResult = (HashMap) hashMap.get("result");
KylinOrderExpress kylinOrderExpress = new KylinOrderExpress();
......@@ -299,6 +308,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer idCount = ids.size();
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
......@@ -313,7 +323,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg);
if (idCount > 1) {
continue;
} else {
return ResponseDto.failure(msg);
}
} else {
KylinOrderExpress kylinOrderExpress = new KylinOrderExpress();
kylinOrderExpress.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS3);
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/AdminUpush.java
View file @ c3a0373d
......@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class AdminUpush implements Serializable {
public class AdminUpush implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -127,4 +127,12 @@ public class AdminUpush implements Serializable {
private String updatedAt;
}
\ No newline at end of file
private static final AdminUpush obj = new AdminUpush();
public static AdminUpush getNew() {
try {
return (AdminUpush) obj.clone();
} catch (CloneNotSupportedException e) {
return new AdminUpush();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBanners.java
View file @ c3a0373d
......@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinBanners implements Serializable {
public class KylinBanners implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -104,5 +104,12 @@ public class KylinBanners implements Serializable {
*/
private String updatedAt;
private static final KylinBanners obj = new KylinBanners();
public static KylinBanners getNew() {
try {
return (KylinBanners) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinBanners();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBannersRelations.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinBannersRelations implements Serializable {
public class KylinBannersRelations implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -55,4 +55,12 @@ public class KylinBannersRelations implements Serializable {
*/
private String updatedAt;
private static final KylinBannersRelations obj = new KylinBannersRelations();
public static KylinBannersRelations getNew() {
try {
return (KylinBannersRelations) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinBannersRelations();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBuyNotice.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinBuyNotice implements Serializable {
public class KylinBuyNotice implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -64,5 +64,13 @@ public class KylinBuyNotice implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinBuyNotice obj = new KylinBuyNotice();
public static KylinBuyNotice getNew() {
try {
return (KylinBuyNotice) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinBuyNotice();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinCheckUser.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinCheckUser implements Serializable {
public class KylinCheckUser implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -64,5 +64,12 @@ public class KylinCheckUser implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinCheckUser obj = new KylinCheckUser();
public static KylinCheckUser getNew() {
try {
return (KylinCheckUser) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinCheckUser();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinCheckUserPerformances.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinCheckUserPerformances implements Serializable {
public class KylinCheckUserPerformances implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -59,5 +59,12 @@ public class KylinCheckUserPerformances implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinCheckUserPerformances obj = new KylinCheckUserPerformances();
public static KylinCheckUserPerformances getNew() {
try {
return (KylinCheckUserPerformances) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinCheckUserPerformances();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinFieldRelations.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinFieldRelations implements Serializable {
public class KylinFieldRelations implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -44,5 +44,12 @@ public class KylinFieldRelations implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinFieldRelations obj = new KylinFieldRelations();
public static KylinFieldRelations getNew() {
try {
return (KylinFieldRelations) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinFieldRelations();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinFieldStatus.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinFieldStatus implements Serializable {
public class KylinFieldStatus implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -64,5 +64,12 @@ public class KylinFieldStatus implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinFieldStatus obj = new KylinFieldStatus();
public static KylinFieldStatus getNew() {
try {
return (KylinFieldStatus) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinFieldStatus();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinFields.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinFields implements Serializable {
public class KylinFields implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -124,5 +124,13 @@ public class KylinFields implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinFields obj = new KylinFields();
public static KylinFields getNew() {
try {
return (KylinFields) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinFields();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinLackRegisters.java
View file @ c3a0373d
......@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinLackRegisters implements Serializable {
public class KylinLackRegisters implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -77,4 +77,13 @@ public class KylinLackRegisters implements Serializable {
lackRegistersId, performanceId, ticketId,userId,userName,userMobile,0,ipAddress,createdAt
};
}
private static final KylinLackRegisters obj = new KylinLackRegisters();
public static KylinLackRegisters getNew() {
try {
return (KylinLackRegisters) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinLackRegisters();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpress.java
View file @ c3a0373d
......@@ -18,7 +18,7 @@ import java.math.BigDecimal;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpress implements Serializable {
public class KylinOrderExpress implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -85,5 +85,12 @@ public class KylinOrderExpress implements Serializable {
*/
private String updatedAt;
private static final KylinOrderExpress obj = new KylinOrderExpress();
public static KylinOrderExpress getNew() {
try {
return (KylinOrderExpress) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderExpress();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpressFeeInfo.java
View file @ c3a0373d
......@@ -18,7 +18,7 @@ import java.math.BigDecimal;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpressFeeInfo implements Serializable {
public class KylinOrderExpressFeeInfo implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -41,5 +41,12 @@ public class KylinOrderExpressFeeInfo implements Serializable {
*/
private String updatedAt;
private static final KylinOrderExpressFeeInfo obj = new KylinOrderExpressFeeInfo();
public static KylinOrderExpressFeeInfo getNew() {
try {
return (KylinOrderExpressFeeInfo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderExpressFeeInfo();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpressPerformances.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpressPerformances implements Serializable {
public class KylinOrderExpressPerformances implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -41,5 +41,12 @@ public class KylinOrderExpressPerformances implements Serializable {
*/
private String updatedAt;
private static final KylinOrderExpressPerformances obj = new KylinOrderExpressPerformances();
public static KylinOrderExpressPerformances getNew() {
try {
return (KylinOrderExpressPerformances) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderExpressPerformances();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpressRoute.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpressRoute implements Serializable {
public class KylinOrderExpressRoute implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -43,5 +43,12 @@ public class KylinOrderExpressRoute implements Serializable {
*/
private String updatedAt;
private static final KylinOrderExpressRoute obj = new KylinOrderExpressRoute();
public static KylinOrderExpressRoute getNew() {
try {
return (KylinOrderExpressRoute) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderExpressRoute();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpressStatus.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpressStatus implements Serializable {
public class KylinOrderExpressStatus implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -46,5 +46,12 @@ public class KylinOrderExpressStatus implements Serializable {
*/
private String updatedAt;
private static final KylinOrderExpressStatus obj = new KylinOrderExpressStatus();
public static KylinOrderExpressStatus getNew() {
try {
return (KylinOrderExpressStatus) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderExpressStatus();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefundBatches.java
View file @ c3a0373d
......@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderRefundBatches implements Serializable {
public class KylinOrderRefundBatches implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -49,5 +49,12 @@ public class KylinOrderRefundBatches implements Serializable {
private LocalDateTime updatedAt;
private static final KylinOrderRefundBatches obj = new KylinOrderRefundBatches();
public static KylinOrderRefundBatches getNew() {
try {
return (KylinOrderRefundBatches) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefundBatches();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefundEntities.java
View file @ c3a0373d
......@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderRefundEntities implements Serializable {
public class KylinOrderRefundEntities implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -38,5 +38,12 @@ public class KylinOrderRefundEntities implements Serializable {
private LocalDateTime updatedAt;
private static final KylinOrderRefundEntities obj = new KylinOrderRefundEntities();
public static KylinOrderRefundEntities getNew() {
try {
return (KylinOrderRefundEntities) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefundEntities();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefundPic.java
View file @ c3a0373d
......@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderRefundPic implements Serializable {
public class KylinOrderRefundPic implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -50,5 +50,12 @@ public class KylinOrderRefundPic implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinOrderRefundPic obj = new KylinOrderRefundPic();
public static KylinOrderRefundPic getNew() {
try {
return (KylinOrderRefundPic) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefundPic();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefunds.java
View file @ c3a0373d
......@@ -151,5 +151,12 @@ public class KylinOrderRefunds implements Serializable {
private LocalDateTime updatedAt;
private static final KylinOrderRefunds obj = new KylinOrderRefunds();
public static KylinOrderRefunds getNew() {
try {
return (KylinOrderRefunds) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderRefunds();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketEntities.java
View file @ c3a0373d
......@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderTicketEntities implements Serializable {
public class KylinOrderTicketEntities implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketRelations.java
View file @ c3a0373d
......@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderTicketRelations implements Serializable {
public class KylinOrderTicketRelations implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceRelations.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinPerformanceRelations implements Serializable {
public class KylinPerformanceRelations implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -74,5 +74,12 @@ public class KylinPerformanceRelations implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinPerformanceRelations obj = new KylinPerformanceRelations();
public static KylinPerformanceRelations getNew() {
try {
return (KylinPerformanceRelations) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformanceRelations();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinPerformanceStatus implements Serializable {
public class KylinPerformanceStatus implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -119,5 +119,12 @@ public class KylinPerformanceStatus implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinPerformanceStatus obj = new KylinPerformanceStatus();
public static KylinPerformanceStatus getNew() {
try {
return (KylinPerformanceStatus) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformanceStatus();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformances.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinPerformances implements Serializable {
public class KylinPerformances implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -164,5 +164,12 @@ public class KylinPerformances implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinPerformances obj = new KylinPerformances();
public static KylinPerformances getNew() {
try {
return (KylinPerformances) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformances();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRoadShows.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinRoadShows implements Serializable {
public class KylinRoadShows implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -59,5 +59,12 @@ public class KylinRoadShows implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinRoadShows obj = new KylinRoadShows();
public static KylinRoadShows getNew() {
try {
return (KylinRoadShows) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinRoadShows();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketRelations.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTicketRelations implements Serializable {
public class KylinTicketRelations implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -49,5 +49,12 @@ public class KylinTicketRelations implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinTicketRelations obj = new KylinTicketRelations();
public static KylinTicketRelations getNew() {
try {
return (KylinTicketRelations) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketRelations();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketStatus.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTicketStatus implements Serializable {
public class KylinTicketStatus implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -154,5 +154,12 @@ public class KylinTicketStatus implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinTicketStatus obj = new KylinTicketStatus();
public static KylinTicketStatus getNew() {
try {
return (KylinTicketStatus) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketStatus();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketTimeRelation.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTicketTimeRelation implements Serializable {
public class KylinTicketTimeRelation implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -49,5 +49,12 @@ public class KylinTicketTimeRelation implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinTicketTimeRelation obj = new KylinTicketTimeRelation();
public static KylinTicketTimeRelation getNew() {
try {
return (KylinTicketTimeRelation) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketTimeRelation();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketTimes.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTicketTimes implements Serializable {
public class KylinTicketTimes implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -69,5 +69,12 @@ public class KylinTicketTimes implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinTicketTimes obj = new KylinTicketTimes();
public static KylinTicketTimes getNew() {
try {
return (KylinTicketTimes) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketTimes();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTickets.java
View file @ c3a0373d
......@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTickets implements Serializable {
public class KylinTickets implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -130,5 +130,12 @@ public class KylinTickets implements Serializable {
*/
private LocalDateTime updatedAt;
private static final KylinTickets obj = new KylinTickets();
public static KylinTickets getNew() {
try {
return (KylinTickets) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTickets();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinZhengzaiAppVersions.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinZhengzaiAppVersions implements Serializable {
public class KylinZhengzaiAppVersions implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -52,5 +52,12 @@ public class KylinZhengzaiAppVersions implements Serializable {
*/
private String updatedAt;
private static final KylinZhengzaiAppVersions obj = new KylinZhengzaiAppVersions();
public static KylinZhengzaiAppVersions getNew() {
try {
return (KylinZhengzaiAppVersions) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinZhengzaiAppVersions();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/PlatformOssFiles.java
View file @ c3a0373d
......@@ -17,7 +17,7 @@ import java.io.Serializable;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class PlatformOssFiles implements Serializable {
public class PlatformOssFiles implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -44,5 +44,12 @@ public class PlatformOssFiles implements Serializable {
*/
private String updatedAt;
private static final PlatformOssFiles obj = new PlatformOssFiles();
public static PlatformOssFiles getNew() {
try {
return (PlatformOssFiles) obj.clone();
} catch (CloneNotSupportedException e) {
return new PlatformOssFiles();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml
View file @ c3a0373d
......@@ -17,6 +17,7 @@
<foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=",">
${orderExpressId}
</foreach>
AND express_status NOT IN (1, 3)
</where>
ORDER BY a.mid DESC
</select>
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ c3a0373d
......@@ -302,10 +302,10 @@
<if test="orderStatus!=null and orderStatus!=''">AND kots.status = #{orderStatus}</if>
<if test="userMobile != null and userMobile != ''">AND kot.user_mobile = #{userMobile}</if>
<if test="userName != null and userName != ''">AND kot.user_name like concat('%', #{userName}, '%')</if>
<if test="userName != null and userName != ''">AND kot.user_name LIKE concat('%', #{userName}, '%')</if>
<if test="expressContacts != null and expressContacts != ''">AND kot.express_contacts = like concat('%', #{expressContacts}, '%')</if>
<if test="expressPhone != null and expressPhone != ''">AND kot.express_phone = #{expressPhone}</if>
<if test="expressContacts != null and expressContacts != ''">AND kot.express_contacts LIKE concat('%', #{expressContacts}, '%')</if>
</where>
</select>
<select id="getCanPlaceOrderList" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLackRegistersServiceImpl.java
View file @ c3a0373d
......@@ -26,9 +26,9 @@ public class KylinLackRegistersServiceImpl implements IKylinLackRegistersService
@Override
public ResponseDto<String> addLackRegister(String performanceId, String ticketId) {
try {
KylinLackRegisters lackRegisters = new KylinLackRegisters();
KylinLackRegisters lackRegisters = KylinLackRegisters.getNew();
Map token = CurrentUtil.getTokenClaims();
lackRegisters.setLackRegistersId(IDGenerator.nextSnowId().toString());
lackRegisters.setLackRegistersId(IDGenerator.nextSnowId());
lackRegisters.setPerformanceId(performanceId);
lackRegisters.setTicketId(ticketId);
lackRegisters.setUserId(CurrentUtil.getCurrentUid());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ c3a0373d
......@@ -116,7 +116,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override
public OrderDetailsVo orderDetails(String orderId) {
Long currentTime = System.currentTimeMillis();
OrderDetailsVo vo = new OrderDetailsVo();
OrderDetailsVo vo = OrderDetailsVo.getNew();
try {
String uid = CurrentUtil.getCurrentUid();
// checkOrderTime(uid);
......@@ -201,14 +201,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
BigDecimal lockPrice = new BigDecimal("0.00");
BigDecimal lockPrice = BigDecimal.valueOf(0.00);
for (KylinOrderRefundsVo item : orderRefundsVoList) {
OrderRefundListVo data = new OrderRefundListVo();
OrderRefundListVo data = OrderRefundListVo.getNew();
data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
data.setOrderRefundsId(item.getOrderRefundsId());
data.setStatus(item.getStatus());
data.setPrice(item.getPrice());
data.setIsMine(uid.equals(item.getApplicantId())?1:0);
data.setIsMine(uid.equals(item.getApplicantId()) ? 1 : 0);
if (item.getStatus().equals(0) || item.getStatus().equals(1) || item.getStatus().equals(7) || item.getStatus().equals(3) || item.getStatus().equals(4)) {
lockPrice = lockPrice.add(item.getPrice());
}
......@@ -220,7 +220,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
&& ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
&& (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))) {
&& (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))) {
vo.setIsCanRefund(1);
} else {
vo.setIsCanRefund(0);
......@@ -273,7 +273,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override
public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId) {
try {
KylinOrderTicketPreVo vo = new KylinOrderTicketPreVo();
KylinOrderTicketPreVo vo = KylinOrderTicketPreVo.getNew();
String uid = CurrentUtil.getCurrentUid();
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
......@@ -285,20 +285,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
List<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVos = new ArrayList<>();
// 数据脱敏
for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
KylinOrderTicketEntitiesPreRefundVo refundVo = new KylinOrderTicketEntitiesPreRefundVo();
KylinOrderTicketEntitiesPreRefundVo refundVo = KylinOrderTicketEntitiesPreRefundVo.getNew();
if (item.getEnterIdCode().length() == 18) {
item.setEnterIdCode(item.getEnterIdCode().substring(0, 3) + "*************" + item.getEnterIdCode().substring(16));
}
if (item.getEnterMobile().length() == 11) {
item.setEnterMobile(item.getEnterMobile().substring(0, 3) + "****" + item.getEnterMobile().substring(7));
}
item.setPriceActual(orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(new BigDecimal(orderTicketVo.getNumber())));
item.setPriceActual(orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber())));
item.setPriceCanRefund(dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, item.getOrderTicketEntitiesId()));
BeanUtils.copyProperties(item, refundVo);
kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
}
orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsTrueName(performanceVo.getIsTrueName());
......@@ -313,7 +313,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override
public ResponseDto<OrderRefundVo> orderRefundDetails(String orderId, String orderRefundId) {
try {
OrderRefundVo vo = new OrderRefundVo();
OrderRefundVo vo = OrderRefundVo.getNew();
String uid = CurrentUtil.getCurrentUid();
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
......@@ -322,9 +322,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return ResponseDto.failure(ErrorMapping.get("20003"));
}
orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length()-10));
kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length() - 10));
vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
vo.setOrderTicketVo(orderTicketVo);
return ResponseDto.success(vo);
......@@ -446,14 +446,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
}
KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
KylinOrderTicketStatus orderStatusTable = KylinOrderTicketStatus.getNew();
orderStatusTable.setStatus(newStatus);
orderStatusTable.setUpdatedAt(time);
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, orderTicketVo.getChangeDate(), orderTicketVo.getChangeDate()
});
KylinOrderTicketVo kylinOrderTicketVo = new KylinOrderTicketVo();
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(newStatus);
kylinOrderTicketVo.setUpdatedAt(strTime);
kylinOrderTicketVo.setChangeDate(time);
......@@ -496,7 +496,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT1;
}
}
KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
KylinOrderTicketEntities entitiesTable = KylinOrderTicketEntities.getNew();
entitiesTable.setIsPayment(newIsPayment);
entitiesTable.setUpdatedAt(time);
......@@ -504,7 +504,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), entitiesVo.getChangeDate(), entitiesVo.getChangeDate()
});
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(newIsPayment);
kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
kylinOrderTicketEntitiesVo.setChangeDate(time);
......@@ -518,7 +518,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
// 退款细节取消
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
KylinOrderRefunds kylinOrderRefunds = KylinOrderRefunds.getNew();
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
......
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