sale-client 3.6.130 → 3.6.131
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -155,9 +155,9 @@
|
|
|
155
155
|
self.mulPrint = self.config.printType instanceof Array
|
|
156
156
|
let http = new HttpResetClass()
|
|
157
157
|
let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
|
|
158
|
-
{data: {items: "f_user_id,min(id) minid,
|
|
158
|
+
{data: {items: "f_user_id,min(id) minid,sum(f_real_amount)f_real_amount,f_userinfo_id,sum(f_surplus_fee) as 'f_surplus_fee'",
|
|
159
159
|
tablename: 't_surplus_detail',
|
|
160
|
-
condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,
|
|
160
|
+
condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userinfo_id`,
|
|
161
161
|
orderitem: 'f_userinfo_id'}},
|
|
162
162
|
{resolveMsg: null, rejectMsg: null})
|
|
163
163
|
if (getSurplus.data.length > 0) {
|
|
@@ -174,9 +174,9 @@
|
|
|
174
174
|
self.mulPrint = self.config.printType instanceof Array
|
|
175
175
|
let http = new HttpResetClass()
|
|
176
176
|
let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
|
|
177
|
-
{data: {items: "min(id) minid,f_user_id,
|
|
177
|
+
{data: {items: "min(id) minid,f_user_id,sum(f_real_amount) f_real_amount,f_userinfo_id,sum(f_surplus_fee) f_surplus_fee",
|
|
178
178
|
tablename: 't_surplus_detail',
|
|
179
|
-
condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,
|
|
179
|
+
condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userinfo_id`,
|
|
180
180
|
orderitem: 'f_userinfo_id'}},
|
|
181
181
|
{resolveMsg: null, rejectMsg: null})
|
|
182
182
|
if (getSurplus.data.length > 0) {
|