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

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

修改 消费

parent 803b6227
...@@ -629,7 +629,7 @@ create table goblin_store_order ...@@ -629,7 +629,7 @@ create table goblin_store_order
pay_type varchar(32) default '' comment '支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]', pay_type varchar(32) default '' comment '支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]',
device_from varchar(32) default '' comment '支付类型来源[wap|js]', device_from varchar(32) default '' comment '支付类型来源[wap|js]',
payment_type varchar(32) default '' comment '支付中心返回实际支付类型', payment_type varchar(32) default '' comment '支付中心返回实际支付类型',
payment_id varchar(32) default '' comment '支付中心返回支付id', payment_id varchar(128) default '' comment '支付中心返回支付id',
cancel_reason varchar(256) default '' comment '取消原因', cancel_reason varchar(256) default '' comment '取消原因',
pre_deposit_pay int default 0 comment '是否存在预付款[0-不存在|1-存在]', pre_deposit_pay int default 0 comment '是否存在预付款[0-不存在|1-存在]',
source varchar(32) default '' comment '订单来源[app|h5|applet]', source varchar(32) default '' comment '订单来源[app|h5|applet]',
......
...@@ -132,7 +132,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService { ...@@ -132,7 +132,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo); redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo); mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
} }
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(), queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku)); SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
} }
return ResponseDto.success(); return ResponseDto.success();
...@@ -199,7 +199,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService { ...@@ -199,7 +199,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
//redis //redis
redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo); redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
//mysql //mysql
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(), queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.get("goblin_order.zhengzai.bind", SqlMapping.get("goblin_order.zhengzai.bind",
uid, now, storeOrderVo.getOrderId(), now, now)); uid, now, storeOrderVo.getOrderId(), now, now));
} }
......
...@@ -393,7 +393,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -393,7 +393,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
//mongo //mongo
mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo); mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
//mysql //mysql
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(), queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku)); SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
} }
//加分 //加分
......
...@@ -661,7 +661,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -661,7 +661,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
//mongo //mongo
mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo); mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
//mysql //mysql
queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_CREATE.getKey(), queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku)); SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
} }
//发短信 //发短信
......
...@@ -77,7 +77,7 @@ goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? WHE ...@@ -77,7 +77,7 @@ goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? WHE
#---- 再次支付 #---- 再次支付
goblin_order.pay.again=UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.pay.again=UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
#---- 订单绑定[正在下单] 出货 #---- 订单绑定[正在下单] 出货
goblin_order.zhengzai.bind=UPDATE goblin_store_order SET uid = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.zhengzai.bind=UPDATE goblin_store_order SET user_id = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
#---- 商铺订单操作 #---- 商铺订单操作
goblin_order.store.cancel=UPDATE goblin_store_order SET mailNo = ? ,delivery_time = ? , logistics_company = ? , status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.store.cancel=UPDATE goblin_store_order SET mailNo = ? ,delivery_time = ? , logistics_company = ? , status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......
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