cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

处理使用积分时取消订单报错

Browse Source
This commit is contained in:
朱耘稷
2020-12-17 20:56:07 +08:00
committed by xuwenbo
parent 91608c851c
commit 62ef709ca6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/yshop3.1.sql
View File

@ -2106,7 +2106,7 @@ CREATE TABLE `yx_store_order` (
`delivery_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '快递单号/手机号', `delivery_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '快递单号/手机号',
`gain_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '消费赚取积分', `gain_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '消费赚取积分',
`use_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '使用积分', `use_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '使用积分',
`back_integral` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '给用户退了多少积分', `back_integral` decimal(8, 2) UNSIGNED NULL DEFAULT 0.00 COMMENT '给用户退了多少积分',
`mark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注', `mark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注',
`is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除', `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除',
`unique` char(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '唯一id(md5加密)类似id', `unique` char(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '唯一id(md5加密)类似id',

1
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -502,6 +502,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_0.getValue()); storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_0.getValue());
storeOrder.setPayType(param.getPayType()); storeOrder.setPayType(param.getPayType());
storeOrder.setUseIntegral(BigDecimal.valueOf(computeVo.getUsedIntegral())); storeOrder.setUseIntegral(BigDecimal.valueOf(computeVo.getUsedIntegral()));
storeOrder.setBackIntegral(BigDecimal.ZERO);
storeOrder.setGainIntegral(gainIntegral); storeOrder.setGainIntegral(gainIntegral);
storeOrder.setMark(param.getMark()); storeOrder.setMark(param.getMark());
storeOrder.setCombinationId(combinationId); storeOrder.setCombinationId(combinationId);