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

Skip to content

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

字段整理；vo整理；update_at整理

parent aba25111
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 149 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftOrderCallBackVo.java
View file @ dadd0a0e
...@@ -43,11 +43,8 @@ public class GoblinNftOrderCallBackVo implements Serializable, Cloneable { ...@@ -43,11 +43,8 @@ public class GoblinNftOrderCallBackVo implements Serializable, Cloneable {
@ApiModelProperty(value = "用户id") @ApiModelProperty(value = "用户id")
private String userId; private String userId;
@ApiModelProperty(value = "skuIdNums") @ApiModelProperty(value = "退款金额")
private String skuIdNums; private BigDecimal price;
@ApiModelProperty(value = "退货时候实际退款金额")
private BigDecimal realBackPrice;
@ApiModelProperty(value = "退款状态 1申请|2退款成功|3退款失败") @ApiModelProperty(value = "退款状态 1申请|2退款成功|3退款失败")
private Integer status; private Integer status;
...@@ -71,13 +68,9 @@ public class GoblinNftOrderCallBackVo implements Serializable, Cloneable { ...@@ -71,13 +68,9 @@ public class GoblinNftOrderCallBackVo implements Serializable, Cloneable {
this.setOrderCode(source.getOrderCode()); this.setOrderCode(source.getOrderCode());
this.setStoreId(source.getStoreId()); this.setStoreId(source.getStoreId());
this.setUserId(source.getUserId()); this.setUserId(source.getUserId());
this.setSkuIdNums(source.getSkuIdNums()); this.setPrice(source.getPrice());
this.setRealBackPrice(source.getRealBackPrice());
this.setStatus(source.getStatus()); this.setStatus(source.getStatus());
this.setRefundAt(source.getRefundAt());
this.setErrorReason(source.getErrorReason());
this.setCreatedAt(source.getCreatedAt()); this.setCreatedAt(source.getCreatedAt());
this.setUpdatedAt(source.getUpdatedAt());
return this; return this;
} }
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftOrderVo.java
View file @ dadd0a0e
...@@ -55,9 +55,6 @@ public class GoblinNftOrderVo implements Serializable, Cloneable { ...@@ -55,9 +55,6 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
@ApiModelProperty(value = "用户手机号") @ApiModelProperty(value = "用户手机号")
private String userMobile; private String userMobile;
@ApiModelProperty(value = "是否会员")
private Integer isMember;
@ApiModelProperty(value = "应付金额") @ApiModelProperty(value = "应付金额")
private BigDecimal priceTotal; private BigDecimal priceTotal;
...@@ -94,54 +91,39 @@ public class GoblinNftOrderVo implements Serializable, Cloneable { ...@@ -94,54 +91,39 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
@ApiModelProperty(value = "订单类型 1购买订单 2兑换订单 3演出赠送订单") @ApiModelProperty(value = "订单类型 1购买订单 2兑换订单 3演出赠送订单")
private Integer orderType; private Integer orderType;
@ApiModelProperty(value = "支付时间")
private LocalDateTime payTime;
@ApiModelProperty(value = "支付单号")
private String payCode;
@ApiModelProperty(value = "支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联") @ApiModelProperty(value = "支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联")
private String payType; private String payType;
@ApiModelProperty(value = "支付终端 app wap js applet") @ApiModelProperty(value = "支付终端 app wap js applet")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "版本号")
private String version;
@ApiModelProperty(value = "订单过期时间(分钟)")
private Integer payCountdownMinute;
@ApiModelProperty(value = "支付时间")
private LocalDateTime payTime;
@ApiModelProperty(value = "支付单号")
private String payCode;
@ApiModelProperty(value = "支付中心返回实际支付类型") @ApiModelProperty(value = "支付中心返回实际支付类型")
private String paymentType; private String paymentType;
@ApiModelProperty(value = "支付中心返回支付id") @ApiModelProperty(value = "支付中心返回支付id")
private String paymentId; private String paymentId;
@ApiModelProperty(value = "钱到了哪个支付平台 平台的订单id为")
private String payStoreId;
@ApiModelProperty(value = "订单过期时间(分钟)")
private Integer payCountdownMinute;
@ApiModelProperty(value = "取消原因") @ApiModelProperty(value = "取消原因")
private String cancelReason; private String cancelReason;
@ApiModelProperty(value = "取消时间") @ApiModelProperty(value = "取消时间")
private LocalDateTime cancelTime; private LocalDateTime cancelTime;
@ApiModelProperty(value = "版本号")
private String version;
@ApiModelProperty(value = "ip地址") @ApiModelProperty(value = "ip地址")
private String ipAddress; private String ipAddress;
@ApiModelProperty(value = "ip地域全名称")
private String area;
@ApiModelProperty(value = "ip地域省")
private String areaProvince;
@ApiModelProperty(value = "ip地域市")
private String areaCity;
@ApiModelProperty(value = "ip地域县")
private String areaCounty;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private LocalDateTime createdAt; private LocalDateTime createdAt;
...@@ -150,35 +132,34 @@ public class GoblinNftOrderVo implements Serializable, Cloneable { ...@@ -150,35 +132,34 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
public GoblinNftOrderVo copy(GoblinNftOrder source) { public GoblinNftOrderVo copy(GoblinNftOrder source) {
if (null == source) return this; if (null == source) return this;
this.setOrderId(source.getOrderId());
this.setSpuId(source.getSpuId()); this.setSpuId(source.getSpuId());
this.setSkuId(source.getSkuId()); this.setSkuId(source.getSkuId());
this.setNum(source.getNum()); this.setNum(source.getNum());
this.setOrderId(source.getOrderId());
this.setStoreId(source.getStoreId()); this.setStoreId(source.getStoreId());
this.setStoreName(source.getStoreName()); this.setStoreName(source.getStoreName());
this.setOrderCode(source.getOrderCode()); this.setOrderCode(source.getOrderCode());
this.setPayCode(source.getPayCode());
this.setUserId(source.getUserId()); this.setUserId(source.getUserId());
this.setUserName(source.getUserName()); this.setUserName(source.getUserName());
this.setUserMobile(source.getUserMobile()); this.setUserMobile(source.getUserMobile());
this.setPriceTotal(source.getPriceTotal()); this.setPriceTotal(source.getPriceTotal());
this.setPriceActual(source.getPriceActual());
this.setPriceCoupon(source.getPriceCoupon()); this.setPriceCoupon(source.getPriceCoupon());
this.setStorePriceCoupon(source.getStorePriceCoupon()); this.setStorePriceCoupon(source.getStorePriceCoupon());
this.setPriceRedEnvelope(source.getPriceRedEnvelope());
this.setPriceVoucher(source.getPriceVoucher()); this.setPriceVoucher(source.getPriceVoucher());
this.setStatus(source.getStatus()); this.setPriceActual(source.getPriceActual());
this.setUcouponId(source.getUcouponId()); this.setUcouponId(source.getUcouponId());
this.setStoreCouponId(source.getStoreCouponId()); this.setStoreCouponId(source.getStoreCouponId());
this.setRedEnvelopeCode(source.getRedEnvelopeCode());
this.setStatus(source.getStatus());
this.setSource(source.getSource());
this.setOrderType(source.getOrderType());
this.setPayType(source.getPayType()); this.setPayType(source.getPayType());
this.setDeviceFrom(source.getDeviceFrom()); this.setDeviceFrom(source.getDeviceFrom());
this.setCancelReason(source.getCancelReason());
this.setSource(source.getSource());
this.setVersion(source.getVersion()); this.setVersion(source.getVersion());
this.setOrderType(source.getOrderType());
this.setPayCountdownMinute(source.getPayCountdownMinute()); this.setPayCountdownMinute(source.getPayCountdownMinute());
this.setPayCode(source.getPayCode());
this.setIpAddress(source.getIpAddress()); this.setIpAddress(source.getIpAddress());
this.setPaymentId(source.getPaymentId());
this.setPaymentType(source.getPaymentType());
this.setCreatedAt(source.getCreatedAt()); this.setCreatedAt(source.getCreatedAt());
return this; return this;
} }
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftOrder.java
View file @ dadd0a0e
...@@ -75,11 +75,6 @@ public class GoblinNftOrder implements Serializable, Cloneable { ...@@ -75,11 +75,6 @@ public class GoblinNftOrder implements Serializable, Cloneable {
*/ */
private String userMobile; private String userMobile;
/**
* 是否会员
*/
private Integer isMember;
/** /**
* 应付金额 * 应付金额
*/ */
...@@ -140,16 +135,6 @@ public class GoblinNftOrder implements Serializable, Cloneable { ...@@ -140,16 +135,6 @@ public class GoblinNftOrder implements Serializable, Cloneable {
*/ */
private Integer orderType; private Integer orderType;
/**
* 支付时间
*/
private LocalDateTime payTime;
/**
* 支付单号
*/
private String payCode;
/** /**
* 支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联 * 支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联
*/ */
...@@ -161,19 +146,9 @@ public class GoblinNftOrder implements Serializable, Cloneable { ...@@ -161,19 +146,9 @@ public class GoblinNftOrder implements Serializable, Cloneable {
private String deviceFrom; private String deviceFrom;
/** /**
* 支付中心返回实际支付类型 * 版本号
*/
private String paymentType;
/**
* 支付中心返回支付id
*/
private String paymentId;
/**
* 钱到了哪个支付平台 平台的订单id为'
*/ */
private String payStoreId; private String version;
/** /**
* 订单过期时间(分钟) * 订单过期时间(分钟)
...@@ -181,44 +156,39 @@ public class GoblinNftOrder implements Serializable, Cloneable { ...@@ -181,44 +156,39 @@ public class GoblinNftOrder implements Serializable, Cloneable {
private Integer payCountdownMinute; private Integer payCountdownMinute;
/** /**
* 取消原因 * 支付时间
*/
private String cancelReason;
/**
* 取消时间
*/ */
private LocalDateTime cancelTime; private LocalDateTime payTime;
/** /**
* 版本号 * 支付单号
*/ */
private String version; private String payCode;
/** /**
* ip地址 * 支付中心返回实际支付类型
*/ */
private String ipAddress; private String paymentType;
/** /**
* ip地域全名称 * 支付中心返回支付id
*/ */
private String area; private String paymentId;
/** /**
* ip地域省 * 取消原因
*/ */
private String areaProvince; private String cancelReason;
/** /**
* ip地域市 * 取消时间
*/ */
private String areaCity; private LocalDateTime cancelTime;
/** /**
* ip地域县 * ip地址
*/ */
private String areaCounty; private String ipAddress;
/** /**
* 创建时间 * 创建时间
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftOrderRefund.java
View file @ dadd0a0e
...@@ -56,14 +56,9 @@ public class GoblinNftOrderRefund implements Serializable, Cloneable { ...@@ -56,14 +56,9 @@ public class GoblinNftOrderRefund implements Serializable, Cloneable {
private String userId; private String userId;
/** /**
* 退货的单品ID多个用,分开 退款的时候不需要，因为退款只能整单退1001-1,1002-3 表示单品id为1001 的单品退货1件 单品id为1002的单品退货3件 * 退款金额
*/ */
private String skuIdNums; private BigDecimal price;
/**
* 退货时候实际退款金额
*/
private BigDecimal realBackPrice;
/** /**
* 退款状态 1申请|2退款成功|3退款失败 * 退款状态 1申请|2退款成功|3退款失败
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql
View file @ dadd0a0e
...@@ -145,7 +145,6 @@ CREATE TABLE goblin_nft_order ...@@ -145,7 +145,6 @@ CREATE TABLE goblin_nft_order
user_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '用户id', user_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '用户id',
user_name VARCHAR(50) NOT NULL DEFAULT '' COMMENT '用户昵称', user_name VARCHAR(50) NOT NULL DEFAULT '' COMMENT '用户昵称',
user_mobile VARCHAR(30) NOT NULL DEFAULT '' COMMENT '用户手机号', user_mobile VARCHAR(30) NOT NULL DEFAULT '' COMMENT '用户手机号',
is_member TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否会员',
price_total DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '应付金额', price_total DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '应付金额',
price_coupon DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '券优惠金额', price_coupon DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '券优惠金额',
store_price_coupon DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '商铺券优惠金额', store_price_coupon DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '商铺券优惠金额',
...@@ -158,24 +157,19 @@ CREATE TABLE goblin_nft_order ...@@ -158,24 +157,19 @@ CREATE TABLE goblin_nft_order
status TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '订单状态 1待付款 2已付款 3未付款取消订单 4退款中 5已退款', status TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '订单状态 1待付款 2已付款 3未付款取消订单 4退款中 5已退款',
source VARCHAR(32) NOT NULL DEFAULT '' COMMENT '订单来源 app h5 applet', source VARCHAR(32) NOT NULL DEFAULT '' COMMENT '订单来源 app h5 applet',
order_type TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '订单类型 1购买订单 2兑换订单 3演出赠送订单', order_type TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '订单类型 1购买订单 2兑换订单 3演出赠送订单',
pay_time DATETIME NULL DEFAULT NULL COMMENT '支付时间',
pay_code VARCHAR(64) NOT NULL DEFAULT '' COMMENT '支付单号',
pay_type VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联', pay_type VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联',
device_from VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付终端 app wap js applet', device_from VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付终端 app wap js applet',
version VARCHAR(32) NOT NULL DEFAULT '' COMMENT '版本号',
pay_countdown_minute TINYINT UNSIGNED DEFAULT 5 COMMENT '订单过期时间(分钟)',
pay_time DATETIME NULL DEFAULT NULL COMMENT '支付时间',
pay_code VARCHAR(64) NOT NULL DEFAULT '' COMMENT '支付单号',
payment_type VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付中心返回实际支付类型', payment_type VARCHAR(32) NOT NULL DEFAULT '' COMMENT '支付中心返回实际支付类型',
payment_id VARCHAR(128) NOT NULL DEFAULT '' COMMENT '支付中心返回支付id', payment_id VARCHAR(128) NOT NULL DEFAULT '' COMMENT '支付中心返回支付id',
pay_store_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '钱到了哪个支付平台 平台的订单id为''',
pay_countdown_minute TINYINT UNSIGNED DEFAULT 5 COMMENT '订单过期时间(分钟)',
cancel_reason VARCHAR(256) NOT NULL DEFAULT '' COMMENT '取消原因', cancel_reason VARCHAR(256) NOT NULL DEFAULT '' COMMENT '取消原因',
cancel_time DATETIME NULL DEFAULT NULL COMMENT '取消时间', cancel_time DATETIME NULL DEFAULT NULL COMMENT '取消时间',
version VARCHAR(32) NOT NULL DEFAULT '' COMMENT '版本号',
ip_address VARCHAR(32) DEFAULT '' COMMENT 'ip地址', ip_address VARCHAR(32) DEFAULT '' COMMENT 'ip地址',
area VARCHAR(32) DEFAULT '' COMMENT 'ip地域全名称', created_at DATETIME NULL DEFAULT NULL COMMENT '创建时间',
area_province VARCHAR(32) DEFAULT '' COMMENT 'ip地域省', updated_at DATETIME NULL DEFAULT NULL COMMENT '更新时间',
area_city VARCHAR(32) DEFAULT '' COMMENT 'ip地域市',
area_county VARCHAR(32) DEFAULT '' COMMENT 'ip地域县',
created_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
updated_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
KEY `nft_order_id_index` (`order_id`), KEY `nft_order_id_index` (`order_id`),
KEY `nft_order_code_index` (`order_code`), KEY `nft_order_code_index` (`order_code`),
KEY `nft_store_id_index` (`store_id`), KEY `nft_store_id_index` (`store_id`),
...@@ -196,13 +190,12 @@ CREATE TABLE goblin_nft_order_refund ...@@ -196,13 +190,12 @@ CREATE TABLE goblin_nft_order_refund
order_code VARCHAR(64) NOT NULL DEFAULT '' COMMENT '订单编号', order_code VARCHAR(64) NOT NULL DEFAULT '' COMMENT '订单编号',
store_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '商铺id', store_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '商铺id',
user_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '用户id', user_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '用户id',
sku_id_nums VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'skuId', price DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '退款金额',
real_back_price DECIMAL(8, 2) NOT NULL DEFAULT 0 COMMENT '退货时候实际退款金额',
status INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款状态 1申请 2退款成功 3退款失败', status INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款状态 1申请 2退款成功 3退款失败',
refund_at DATETIME NULL DEFAULT NULL COMMENT '退款时间', refund_at DATETIME NULL DEFAULT NULL COMMENT '退款时间',
error_reason VARCHAR(255) NOT NULL DEFAULT '' COMMENT '退款失败原因', error_reason VARCHAR(255) NOT NULL DEFAULT '' COMMENT '退款失败原因',
created_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', created_at DATETIME NULL DEFAULT NULL COMMENT '创建时间',
updated_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', updated_at DATETIME NULL DEFAULT NULL COMMENT '更新时间',
KEY `nft_refund__index` (`order_refund_id`), KEY `nft_refund__index` (`order_refund_id`),
KEY `nft_refund_refund_code_index` (`refund_code`), KEY `nft_refund_refund_code_index` (`refund_code`),
KEY `nft_refund_order_id_index` (`order_id`), KEY `nft_refund_order_id_index` (`order_id`),
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftOrderAppServiceImpl.java
View file @ dadd0a0e
...@@ -74,6 +74,7 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService { ...@@ -74,6 +74,7 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
} }
// 订单信息 // 订单信息
GoblinNftOrderDetailsVo orderDetails = GoblinNftOrderDetailsVo.getNew().copy(orderVo); GoblinNftOrderDetailsVo orderDetails = GoblinNftOrderDetailsVo.getNew().copy(orderVo);
orderDetails.setOrderCode(orderDetails.getOrderCode().substring(orderDetails.getOrderCode().length() - 10));
// 商品信息 // 商品信息
GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(orderVo.getSkuId()); GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(orderVo.getSkuId());
GoblinNftGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo); GoblinNftGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java
View file @ dadd0a0e
...@@ -195,31 +195,33 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -195,31 +195,33 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
// 生成订单 // 生成订单
GoblinNftOrder nftOrder = GoblinNftOrder.getNew(); GoblinNftOrder nftOrder = GoblinNftOrder.getNew();
nftOrder.setOrderId(orderId); nftOrder.setOrderId(orderId);
nftOrder.setOrderCode(orderCode);
nftOrder.setStoreId(storeId);
nftOrder.setSkuId(payParam.getSkuId());
nftOrder.setSpuId(spuId); nftOrder.setSpuId(spuId);
nftOrder.setSkuId(payParam.getSkuId());
nftOrder.setNum(number); nftOrder.setNum(number);
nftOrder.setStoreId(storeId);
nftOrder.setStoreName(storeName); nftOrder.setStoreName(storeName);
nftOrder.setOrderCode(orderCode);
nftOrder.setUserId(uid); nftOrder.setUserId(uid);
nftOrder.setUserName(StringUtils.defaultString(((String) token.get(CurrentUtil.TOKEN_NICKNAME)), "")); nftOrder.setUserName(StringUtils.defaultString(((String) token.get(CurrentUtil.TOKEN_NICKNAME)), ""));
nftOrder.setUserMobile(StringUtils.defaultString(((String) token.get(CurrentUtil.TOKEN_MOBILE)), "")); nftOrder.setUserMobile(StringUtils.defaultString(((String) token.get(CurrentUtil.TOKEN_MOBILE)), ""));
nftOrder.setPriceTotal(totalPrice); nftOrder.setPriceTotal(totalPrice);
BigDecimal priceActual = totalPrice.subtract(voucherPrice).subtract(storeVoucherPrice);
nftOrder.setPriceActual(priceActual.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : priceActual);
nftOrder.setPriceCoupon(voucherPrice); nftOrder.setPriceCoupon(voucherPrice);
nftOrder.setStorePriceCoupon(storeVoucherPrice); nftOrder.setStorePriceCoupon(storeVoucherPrice);
nftOrder.setPriceRedEnvelope(BigDecimal.ZERO);
nftOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice)); nftOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice));
nftOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_1.getValue()); BigDecimal priceActual = totalPrice.subtract(voucherPrice).subtract(storeVoucherPrice);
nftOrder.setPriceActual(priceActual.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : priceActual);
/*nftOrder.setUcouponId(payParam.getPlatVoucherCode()); /*nftOrder.setUcouponId(payParam.getPlatVoucherCode());
nftOrder.setStoreCouponId(payParam.getStoreVoucherCode());*/ nftOrder.setStoreCouponId(payParam.getStoreVoucherCode());*/
nftOrder.setUcouponId(""); nftOrder.setUcouponId("");
nftOrder.setStoreCouponId(""); nftOrder.setStoreCouponId("");
nftOrder.setRedEnvelopeCode("");
nftOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_1.getValue());
nftOrder.setSource(source);
nftOrder.setOrderType(GoblinStatusConst.NftStatus.ORDER_TYPE_1.getValue());
nftOrder.setPayType(payParam.getPayType()); nftOrder.setPayType(payParam.getPayType());
nftOrder.setDeviceFrom(payParam.getDeviceFrom()); nftOrder.setDeviceFrom(payParam.getDeviceFrom());
nftOrder.setSource(source);
nftOrder.setVersion(version); nftOrder.setVersion(version);
nftOrder.setOrderType(GoblinStatusConst.NftStatus.ORDER_TYPE_1.getValue());
nftOrder.setPayCountdownMinute(5); nftOrder.setPayCountdownMinute(5);
nftOrder.setIpAddress(CurrentUtil.getCliIpAddr()); nftOrder.setIpAddress(CurrentUtil.getCliIpAddr());
nftOrder.setCreatedAt(now); nftOrder.setCreatedAt(now);
...@@ -293,10 +295,10 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -293,10 +295,10 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
nftOrder.setPayCode(payCode); nftOrder.setPayCode(payCode);
sqlDataOrder.add(new Object[]{ sqlDataOrder.add(new Object[]{
nftOrder.getSpuId(), nftOrder.getSkuId(), nftOrder.getNum(), nftOrder.getOrderId(), nftOrder.getSpuId(), nftOrder.getSkuId(),
nftOrder.getOrderId(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPayCode(), nftOrder.getNum(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPriceCoupon(),
nftOrder.getPriceActual(), nftOrder.getPriceCoupon(), nftOrder.getStorePriceCoupon(), nftOrder.getPriceVoucher(), nftOrder.getStatus(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getStorePriceCoupon(), nftOrder.getPriceRedEnvelope(), nftOrder.getPriceVoucher(), nftOrder.getPriceActual(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getRedEnvelopeCode(), nftOrder.getStatus(), nftOrder.getSource(),
nftOrder.getSource(), nftOrder.getVersion(), nftOrder.getOrderType(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt() nftOrder.getOrderType(), nftOrder.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getVersion(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt(), nftOrder.getPayCode()
}); });
// 订单vo // 订单vo
...@@ -492,13 +494,14 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -492,13 +494,14 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
}); });
// redis // redis
orderVo.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_2.getValue()); orderVo.setPaymentType(syncOrderParam.getPaymentType());
orderVo.setPaymentId(syncOrderParam.getPaymentId());
orderVo.setPayCode(syncOrderParam.getCode()); orderVo.setPayCode(syncOrderParam.getCode());
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime parsedDate = LocalDateTime.parse(syncOrderParam.getPaymentAt(), formatter); LocalDateTime parsedDate = LocalDateTime.parse(syncOrderParam.getPaymentAt(), formatter);
orderVo.setPayTime(parsedDate); orderVo.setPayTime(parsedDate);
orderVo.setPaymentId(syncOrderParam.getPaymentId()); orderVo.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_2.getValue());
orderVo.setPaymentType(syncOrderParam.getPaymentType()); orderVo.setUpdatedAt(now);
nftOrderUtils.setNftOrder(orderVo); nftOrderUtils.setNftOrder(orderVo);
// mongo // mongo
goblinMongoUtils.updateGoblinNftOrderVo(orderVo); goblinMongoUtils.updateGoblinNftOrderVo(orderVo);
...@@ -531,14 +534,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -531,14 +534,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
} }
Integer status = refundCallbackParam.getStatus(); Integer status = refundCallbackParam.getStatus();
if (1 == status) { // 退款成功 if (1 == status) { // 退款成功
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsBackOrder = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("goblin_nft_order.update.refund"));
sqls.add(SqlMapping.get("goblin_nft_order_refund.refund"));
String orderId = nftOrderRefundVo.getOrderId(); String orderId = nftOrderRefundVo.getOrderId();
GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId); GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
nftOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_5.getValue()); nftOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_5.getValue());
nftOrder.setUpdatedAt(now);
// 取消订单已经回滚了库存和购买数量 这里不需要处理了
/*if (StringUtil.isNotEmpty(nftOrder.getUcouponId())) { /*if (StringUtil.isNotEmpty(nftOrder.getUcouponId())) {
goblinOrderUtils.backCoupon(nftOrder.getUcouponId(), nftOrder.getUserId()); goblinOrderUtils.backCoupon(nftOrder.getUcouponId(), nftOrder.getUserId());
} }
...@@ -553,6 +553,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -553,6 +553,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
}*/ }*/
nftOrderRefundVo.setStatus(GoblinStatusConst.NftStatus.ORDER_REFUND_STATUS_2.getValue()); nftOrderRefundVo.setStatus(GoblinStatusConst.NftStatus.ORDER_REFUND_STATUS_2.getValue());
nftOrderRefundVo.setRefundAt(now); nftOrderRefundVo.setRefundAt(now);
nftOrderRefundVo.setUpdatedAt(now);
//redis //redis
nftOrderUtils.setNftOrder(nftOrder); nftOrderUtils.setNftOrder(nftOrder);
nftOrderUtils.setBackOrderVo(nftOrderRefundVo); nftOrderUtils.setBackOrderVo(nftOrderRefundVo);
...@@ -560,6 +561,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -560,6 +561,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
goblinMongoUtils.updateGoblinNftOrderVo(nftOrder); goblinMongoUtils.updateGoblinNftOrderVo(nftOrder);
goblinMongoUtils.updateGoblinNftOrderRefundVo(nftOrderRefundVo); goblinMongoUtils.updateGoblinNftOrderRefundVo(nftOrderRefundVo);
//mysql //mysql
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsBackOrder = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("goblin_nft_order.update.refund"));
sqls.add(SqlMapping.get("goblin_nft_order_refund.refund"));
sqlsOrder.add(new Object[]{ sqlsOrder.add(new Object[]{
nftOrder.getStatus(), now, nftOrder.getStatus(), now,
orderId, now, now orderId, now, now
...@@ -570,7 +576,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -570,7 +576,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(), queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.gets(sqls, sqlsOrder, sqlsBackOrder)); SqlMapping.gets(sqls, sqlsOrder, sqlsBackOrder));
//减积分 //减积分
goblinOrderUtils.desTask(nftOrder.getUserId(), nftOrderRefundVo.getRealBackPrice()); goblinOrderUtils.desTask(nftOrder.getUserId(), nftOrderRefundVo.getPrice());
} else if (0 == status) { } else if (0 == status) {
log.info("NftRefundCallback: 支付平台返回状态为失败，编号{}", refundCallbackParam.getOrderRefundCode()); log.info("NftRefundCallback: 支付平台返回状态为失败，编号{}", refundCallbackParam.getOrderRefundCode());
return "fail"; return "fail";
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinNftOrderUtils.java
View file @ dadd0a0e
...@@ -254,17 +254,14 @@ public class GoblinNftOrderUtils { ...@@ -254,17 +254,14 @@ public class GoblinNftOrderUtils {
nftBackOrder.setOrderCode(nftOrder.getOrderCode()); nftBackOrder.setOrderCode(nftOrder.getOrderCode());
nftBackOrder.setStoreId(nftOrder.getStoreId()); nftBackOrder.setStoreId(nftOrder.getStoreId());
nftBackOrder.setUserId(nftOrder.getUserId()); nftBackOrder.setUserId(nftOrder.getUserId());
nftBackOrder.setSkuIdNums(nftOrder.getSkuId()); nftBackOrder.setPrice(refundPrice);
nftBackOrder.setRealBackPrice(refundPrice);
nftBackOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_REFUND_STATUS_1.getValue()); nftBackOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_REFUND_STATUS_1.getValue());
nftBackOrder.setCreatedAt(now); nftBackOrder.setCreatedAt(now);
nftBackOrder.setUpdatedAt(now);
nftBackOrder.setRefundAt(LocalDateTime.now());
nftBackOrder.setErrorReason("");
GoblinNftOrderCallBackVo backOrderVo = GoblinNftOrderCallBackVo.getNew().copy(nftBackOrder); GoblinNftOrderCallBackVo backOrderVo = GoblinNftOrderCallBackVo.getNew().copy(nftBackOrder);
backOrderVo.setErrorReason("");
// 调用退款 // 调用退款 超时支付回调可能还未完成 所以redisVo没有此俩个参数
nftOrder.setPaymentId(paymentId); nftOrder.setPaymentId(paymentId);
nftOrder.setPaymentType(paymentType); nftOrder.setPaymentType(paymentType);
String returnString = initRefund(nftOrder, refundPrice, refundCode); String returnString = initRefund(nftOrder, refundPrice, refundCode);
...@@ -288,8 +285,8 @@ public class GoblinNftOrderUtils { ...@@ -288,8 +285,8 @@ public class GoblinNftOrderUtils {
SqlMapping.get("goblin_nft_order_refund.insert", SqlMapping.get("goblin_nft_order_refund.insert",
nftBackOrder.getOrderRefundId(), nftBackOrder.getRefundCode(), nftBackOrder.getOrderId(), nftBackOrder.getOrderRefundId(), nftBackOrder.getRefundCode(), nftBackOrder.getOrderId(),
nftBackOrder.getOrderCode(), nftBackOrder.getStoreId(), nftBackOrder.getUserId(), nftBackOrder.getOrderCode(), nftBackOrder.getStoreId(), nftBackOrder.getUserId(),
nftBackOrder.getSkuIdNums(), nftBackOrder.getRealBackPrice(), backOrderVo.getStatus(), nftBackOrder.getPrice(), backOrderVo.getStatus(),
nftBackOrder.getRefundAt(), backOrderVo.getErrorReason() backOrderVo.getErrorReason()
) )
); );
if (success) { if (success) {
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties
View file @ dadd0a0e
...@@ -47,8 +47,8 @@ goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_ ...@@ -47,8 +47,8 @@ goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_
goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#-------- NFT ------- #-------- NFT -------
goblin_nft_order.insert=INSERT INTO goblin_nft_order (`spu_id`,`sku_id`,`num`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`pay_code`,`price_actual`,`price_coupon`,`store_price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`store_coupon_id`,`pay_type`,`device_from`,`source`,`version`,`order_type`,`pay_countdown_minute`,`ip_address`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin_nft_order.insert=INSERT INTO goblin_nft_order (`order_id`,`spu_id`,`sku_id`,`num`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_coupon`,`store_price_coupon`,`price_red_envelope`,`price_voucher`,`price_actual`,`ucoupon_id`,`store_coupon_id`,`red_envelope_code`,`status`,`source`,`order_type`,`pay_type`,`device_from`,`version`,`pay_countdown_minute`,`ip_address`,`created_at`,`pay_code`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_nft_order.update.pay=UPDATE goblin_nft_order SET payment_type = ?, payment_id=?, pay_code = ?, pay_time = ?, status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_nft_order.update.pay=UPDATE goblin_nft_order SET payment_type = ?, payment_id=?, pay_code = ?, pay_time = ?, status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_nft_order.update.refund=UPDATE goblin_nft_order SET status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_nft_order.update.refund=UPDATE goblin_nft_order SET status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_nft_order_refund.insert=INSERT INTO goblin_nft_order_refund (`order_refund_id`,`refund_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`real_back_price`,`status`,`refund_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?) goblin_nft_order_refund.insert=INSERT INTO goblin_nft_order_refund (`order_refund_id`,`refund_code`,`order_id`,`order_code`,`store_id`,`user_id`,`price`,`status`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?)
goblin_nft_order_refund.refund=UPDATE goblin_nft_order_refund SET status = ?, refund_at = ?, updated_at = ? WHERE order_refund_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_nft_order_refund.refund=UPDATE goblin_nft_order_refund SET status = ?, refund_at = ?, updated_at = ? WHERE order_refund_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
\ No newline at end of file
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