Browse Source

1.邀请分享红包调整;

Lawsun 1 year ago
parent
commit
17424f3693

+ 15 - 12
.idea/workspace.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1.git;">
-      <change beforePath="$PROJECT_DIR$/config/async/oneshop/redis.js" beforeDir="false" afterPath="$PROJECT_DIR$/config/async/oneshop/redis.js" afterDir="false" />
+    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1...;">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/controller/home/shop.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/shop.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/controller/home/user.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/user.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -243,13 +246,6 @@
       <workItem from="1687224873195" duration="3214000" />
       <workItem from="1687656657295" duration="6710000" />
     </task>
-    <task id="LOCAL-00017" summary="1.新增用户代理认证申请记录表以及CRUD接口;">
-      <created>1669801868855</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1669801868855</updated>
-    </task>
     <task id="LOCAL-00018" summary="1.新增用户字段is_proxy;">
       <created>1669801947885</created>
       <option name="number" value="00018" />
@@ -586,7 +582,14 @@
       <option name="project" value="LOCAL" />
       <updated>1687781395629</updated>
     </task>
-    <option name="localTasksCounter" value="66" />
+    <task id="LOCAL-00066" summary="1...;">
+      <created>1687781493891</created>
+      <option name="number" value="00066" />
+      <option name="presentableId" value="LOCAL-00066" />
+      <option name="project" value="LOCAL" />
+      <updated>1687781493891</updated>
+    </task>
+    <option name="localTasksCounter" value="67" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -632,7 +635,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.商家扫客户付款码申请核销餐币;" />
     <MESSAGE value="1.商家餐币提现;" />
     <MESSAGE value="1.删除定时任务:订单检查发放;" />
     <MESSAGE value="1.餐币钱包有效期90天;" />
@@ -657,7 +659,8 @@
     <MESSAGE value="1.完善地址或自提文案;" />
     <MESSAGE value="1.redis db 15;" />
     <MESSAGE value="1.git;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.git;" />
+    <MESSAGE value="1...;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1...;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 1 - 1
app/controller/home/shop.js

@@ -32,7 +32,7 @@ module.exports = class ShopController extends Base {
     const temB = temA.replace(']', '');
     let canDiscountCategory = temB.split(',');
     canDiscountCategory = canDiscountCategory.map(Number);
-    config.notDiscountCategory = canDiscountCategory;
+    config.canDiscountCategory = canDiscountCategory;
     return that.ctx.appJson(that.app.szjcomo.appResult('SUCCESS', config, false));
   }
 

+ 4 - 4
app/controller/home/user.js

@@ -314,8 +314,8 @@ module.exports = class UserController extends shopController {
       // 2022/9/27 新用户注册 写入信息
       user = await that.writeWxUser(userInfo);
       user.isNew = true;
-      // 2022/9/27: 新用户红包奖励16.88元
-      await that.service.shop.userMoneyAdd(user.user_id, 16.88, null, '新用户注册奖励', 0, 1, -1);
+      // 2022/9/27: 新用户红包奖励8.8元
+      await that.service.shop.userMoneyAdd(user.user_id, 8.8, null, '新用户注册奖励', 0, 1, -1);
       // 2022/9/29 受邀注册奖励 和 邀请新用户奖励
       if (inviter_id > 0) {
         try {
@@ -324,8 +324,8 @@ module.exports = class UserController extends shopController {
             attributes: [ 'user_id', 'nickname', 'headimgurl' ],
             raw: true,
           });
-          await that.service.shop.userMoneyAdd(user.user_id, 8.88, null, '受邀注册奖励', 0, 2, inviter_id, inviterInfo.nickname, inviterInfo.headimgurl);
-          await that.service.shop.userMoneyAdd(inviter_id, 8.88, null, '邀请新用户奖励', 0, 3, user.user_id, user.nickname, user.headimgurl);
+          await that.service.shop.userMoneyAdd(user.user_id, 1.68, null, '受邀注册奖励', 0, 2, inviter_id, inviterInfo.nickname, inviterInfo.headimgurl);
+          await that.service.shop.userMoneyAdd(inviter_id, 1.68, null, '邀请新用户奖励', 0, 3, user.user_id, user.nickname, user.headimgurl);
           // 2022/11/17 邀请关系绑定
           await that.service.inviter.addRelUserInviter(user.user_id, inviter_id);
         } catch (e) {

File diff suppressed because it is too large
+ 0 - 0
node_modules/egg-ts-helper/.tmp/eggInfo.json


Some files were not shown because too many files changed in this diff