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

Commit e33d755f authored by 胡佳晨's avatar 胡佳晨

修改下单

parent fb0003c5
...@@ -50,6 +50,7 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService { ...@@ -50,6 +50,7 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
public ResponseDto<String> order(String itemId, Integer number) { public ResponseDto<String> order(String itemId, Integer number) {
//判断状态 库存 //判断状态 库存
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
String mCouponId = IDGenerator.nextTimeId2();
StoneScoreItems data = stoneRedisUtils.getItemData(itemId); StoneScoreItems data = stoneRedisUtils.getItemData(itemId);
if (data == null) { if (data == null) {
return ResponseDto.failure("参数异常"); return ResponseDto.failure("参数异常");
...@@ -117,13 +118,14 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService { ...@@ -117,13 +118,14 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
order.getOrderId(), order.getUid(), order.getUserName(), order.getUserMobile(), order.getOrderId(), order.getUid(), order.getUserName(), order.getUserMobile(),
order.getItemId(), order.getTargetTitle(), order.getOrderCode(), order.getNumber(), order.getPrice(), order.getItemId(), order.getTargetTitle(), order.getOrderCode(), order.getNumber(), order.getPrice(),
order.getScore(), order.getPriceExpress(), order.getPriceActual(), order.getPayType(), order.getPaymentType(), order.getScore(), order.getPriceExpress(), order.getPriceActual(), order.getPayType(), order.getPaymentType(),
order.getPaymentId(), order.getTimePay(), order.getPayCountdownMinute(), order.getStatus(), 1, order.getCreatedAt() order.getPaymentId(), order.getTimePay(), order.getPayCountdownMinute(), order.getStatus(), 1, order.getCreatedAt(),
mCouponId
}); });
//mysql 发送券 //mysql 发送券
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("stone_candy_mgt_coupon.add_for_member")); sqls.add(SqlMapping.get("stone_candy_mgt_coupon.add_for_member"));
sqlsDataB.add(new Object[]{ sqlsDataB.add(new Object[]{
IDGenerator.nextTimeId2(), data.getTargetId(), number, order.getUserMobile(), order.getCreatedAt(), "SCORE_BUY_COUPON", order.getCreatedAt() mCouponId, data.getTargetId(), number, order.getUserMobile(), order.getCreatedAt(), "SCORE_BUY_COUPON", order.getCreatedAt()
}); });
// 执行sql // 执行sql
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB); String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB);
......
...@@ -5,4 +5,4 @@ stone_score_user.insert=INSERT INTO `stone_score_user`(`score_id` ,`uid` ,`statu ...@@ -5,4 +5,4 @@ stone_score_user.insert=INSERT INTO `stone_score_user`(`score_id` ,`uid` ,`statu
#---- 生成订单 ---- #---- 生成订单 ----
stone_score_order.insert=INSERT INTO `stone_score_order`(`order_id` ,`uid` ,`user_name` ,`user_mobile`,`item_id`,`target_title`,`order_code`,`number`,`price`,`score`,`price_express`,`price_actual`,`pay_type`,`payment_type`,`payment_id`,`time_pay`,`pay_countdown_minute`,`status`,`pay_status`,`created_at`) VALUES(? ,? ,? ,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ); stone_score_order.insert=INSERT INTO `stone_score_order`(`order_id` ,`uid` ,`user_name` ,`user_mobile`,`item_id`,`target_title`,`order_code`,`number`,`price`,`score`,`price_express`,`price_actual`,`pay_type`,`payment_type`,`payment_id`,`time_pay`,`pay_countdown_minute`,`status`,`pay_status`,`created_at`) VALUES(? ,? ,? ,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? );
#---- 发券 ---- #---- 发券 ----
stone_candy_mgt_coupon.add_for_member=INSERT INTO candy_mgt_coupon (mcoupon_id, coupon_id, `state`, event_amt, event_type, event_limit, event_at, `operator`, created_at) VALUES (?, ?, 0, ?, 2, ?, ?, ?, ?) stone_candy_mgt_coupon.add_for_member=INSERT INTO candy_mgt_coupon (mcoupon_id, coupon_id, `state`, event_amt, event_type, event_limit, event_at, `operator`, created_at,comment) VALUES (?, ?, 0, ?, 2, ?, ?, ?, ?,?)
\ No newline at end of file \ 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