Commit 09cc5714 authored by wlx@33.cn's avatar wlx@33.cn

修正盲盒下单

parent 8bc10a90
...@@ -1519,8 +1519,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -1519,8 +1519,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
*/ */
BigDecimal avilableNum = payableAmount.divide(price, 2, RoundingMode.UP); BigDecimal avilableNum = payableAmount.divide(price, 2, RoundingMode.UP);
result = avilableNum.compareTo(orderVo.getCoinNumber()) == CommonConst.BIEDICIMAL_LEFT_GREATER ? orderVo.getCoinNumber() : avilableNum; result = avilableNum.compareTo(orderVo.getCoinNumber()) == CommonConst.BIEDICIMAL_LEFT_GREATER ? orderVo.getCoinNumber() : avilableNum;
payableAmount = payableAmount.subtract(orderVo.getCoinNumber().multiply(price).setScale(2, RoundingMode.DOWN)) payableAmount = payableAmount.subtract(orderVo.getCoinNumber().multiply(price).setScale(2, RoundingMode.DOWN));
.compareTo(BigDecimal.ZERO) == CommonConst.BIEDICIMAL_LEFT_GREATER ? payableAmount : BigDecimal.ZERO; payableAmount = payableAmount.compareTo(BigDecimal.ZERO) == CommonConst.BIEDICIMAL_LEFT_GREATER ? payableAmount : BigDecimal.ZERO;
saveUserAssetRecord(uid, orderVo, result, payId); saveUserAssetRecord(uid, orderVo, result, payId);
} }
return result; return result;
......
...@@ -2523,3 +2523,6 @@ ALTER TABLE `order_detail` ...@@ -2523,3 +2523,6 @@ ALTER TABLE `order_detail`
update user_asset set goods_coin = coin; update user_asset set goods_coin = coin;
ALTER TABLE `user_asset_record` ADD COLUMN `goods_coin` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商品coin'; ALTER TABLE `user_asset_record` ADD COLUMN `goods_coin` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商品coin';
ALTER TABLE `merchant_integral`
ADD COLUMN `price` decimal(20,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '行情 1积分=n人民币';
\ 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