|
@@ -495,6 +495,7 @@ module.exports = class UserController extends shopController {
|
|
|
const data = await that.ctx.validate(that.userMoneyValidate, await that.ctx.getParse());
|
|
|
const selectBean = await that.app.comoBean.instance(data, {
|
|
|
where: { user_id: data.user_id, expired: false },
|
|
|
+ include: { model: that.app.model.PartnerInfo, as: 'partnerInfo', attributes: [ 'latitude', 'longitude' ] }
|
|
|
});
|
|
|
// 2023/2/28 直接查询所有数据 不分页
|
|
|
const result = await that.service.base.select(selectBean, that.app.model.DinnerCoins, '查询餐饮币账户失败,请稍候重试', false, true);
|
|
@@ -553,7 +554,7 @@ module.exports = class UserController extends shopController {
|
|
|
},
|
|
|
attributes: [ [ seq.fn('sum', seq.col('account')), 'account' ] ],
|
|
|
});
|
|
|
- const result = await that.service.base.select(selectBean, that.app.model.DinnerCoins, '查询餐饮币账户余额失败,请稍候重试', false, false);
|
|
|
+ const result = await that.service.base.select(selectBean, that.app.model.DinnerCoins, '查询客户卡券账户失败,请稍候重试', false, false);
|
|
|
const res = JSON.parse(JSON.stringify(result));
|
|
|
res.customer_id = userInfo.user_id;
|
|
|
res.partner_id = businessInfo.partner_id;
|