ts-glitter 21.6.8 → 21.7.1

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.
Files changed (26) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/cms-plugin/shopping-order-manager.js +5 -8
  4. package/lowcode/cms-plugin/shopping-order-manager.ts +6 -13
  5. package/lowcode/glitter-base/global/language.js +8 -0
  6. package/lowcode/glitter-base/global/language.ts +8 -0
  7. package/lowcode/glitter-base/route/user.js +9 -8
  8. package/lowcode/glitter-base/route/user.ts +9 -8
  9. package/lowcode/official_view_component/official/component.js +3 -0
  10. package/lowcode/official_view_component/official/component.ts +2 -0
  11. package/lowcode/public-components/checkout/index.js +2 -4
  12. package/lowcode/public-components/checkout/index.ts +2 -5
  13. package/lowcode/public-components/user-manager/um-receive.js +93 -73
  14. package/lowcode/public-components/user-manager/um-receive.ts +92 -67
  15. package/lowcode/view-model/saas-view-model.js +3 -1
  16. package/lowcode/view-model/saas-view-model.ts +10 -7
  17. package/package.json +1 -1
  18. package/src/api-public/services/checkout-event.js +4 -3
  19. package/src/api-public/services/checkout-event.js.map +1 -1
  20. package/src/api-public/services/checkout-event.ts +6 -6
  21. package/src/api-public/services/rebate.js +3 -1
  22. package/src/api-public/services/rebate.js.map +1 -1
  23. package/src/api-public/services/rebate.ts +4 -1
  24. package/src/api-public/services/shopping.js +4 -7
  25. package/src/api-public/services/shopping.js.map +1 -1
  26. package/src/api-public/services/shopping.ts +10 -10
package/src/api-public/services/rebate.ts CHANGED
@@ -246,7 +246,10 @@ export class Rebate {
246
246
  try {
247
247
  if (query.search || query.email_or_phone) {
248
248
  const users = (await db.query(getUsersSQL, [])).map((user: { userID: number }) => user.userID);
249
- rebateSearchSQL = `AND r.user_id in (${users.join(',')})`;
249
+ if(users.length > 0){
250
+ rebateSearchSQL = `AND r.user_id in (${users.join(',')})`;
251
+ }
252
+
250
253
  }
251
254
 
252
255
  const rebateCountSQL = `SELECT count(r.id) as c FROM \`${this.app}\`.t_rebate_point as r
package/src/api-public/services/shopping.js CHANGED
@@ -2211,7 +2211,7 @@ class Shopping {
2211
2211
  else if (!update.orderData.user_info.shipment_number) {
2212
2212
  delete update.orderData.user_info.shipment_date;
2213
2213
  }
2214
- const updateProgress = update.orderData.progress;
2214
+ const updateProgress = update.orderData.progress || 'wait';
2215
2215
  if (updateProgress === 'wait' &&
2216
2216
  update.orderData.user_info.shipment_number &&
2217
2217
  update.orderData.user_info.shipment_number !== origin.orderData.user_info.shipment_number) {
@@ -3222,9 +3222,7 @@ class Shopping {
3222
3222
  insertObj.id = originalVariant.id;
3223
3223
  sourceMap[originalVariant.id] = originalVariant.id;
3224
3224
  }
3225
- const insertData = await database_js_1.default.query(`replace
3226
- INTO \`${this.app}\`.t_variants
3227
- SET ?
3225
+ const insertData = await database_js_1.default.query(`REPLACE INTO \`${this.app}\`.t_variants SET ?
3228
3226
  `, [insertObj]);
3229
3227
  return insertData;
3230
3228
  });
@@ -3250,9 +3248,8 @@ class Shopping {
3250
3248
  user_id: 'manager',
3251
3249
  value: exhibitionConfig,
3252
3250
  });
3253
- await database_js_1.default.query(`UPDATE \`${this.app}\`.t_manager_post
3254
- SET ?
3255
- WHERE id = ?`, [{ content: JSON.stringify(content) }, content.id]);
3251
+ await database_js_1.default.query(`UPDATE \`${this.app}\`.t_manager_post SET ? WHERE id = ?
3252
+ `, [{ content: JSON.stringify(content) }, content.id]);
3256
3253
  }
3257
3254
  catch (error) {
3258
3255
  console.error(error);