瀏覽代碼

1.暂存;

Lawsun 1 年之前
父節點
當前提交
256f05628e

+ 19 - 13
.idea/workspace.xml

@@ -1,10 +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...;">
+    <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/RelInviter.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/RelInviter.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$/app/service/commission.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/service/commission.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" />
@@ -54,7 +55,7 @@
     &quot;ASKED_MARK_IGNORED_FILES_AS_EXCLUDED&quot;: &quot;true&quot;,
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/ysjjCode/shop-system/app/service&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/ysjjCode/shop-system&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
@@ -245,13 +246,11 @@
       <workItem from="1686379539203" duration="750000" />
       <workItem from="1687224873195" duration="3214000" />
       <workItem from="1687656657295" duration="6710000" />
-    </task>
-    <task id="LOCAL-00018" summary="1.新增用户字段is_proxy;">
-      <created>1669801947885</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1669801947885</updated>
+      <workItem from="1688519673249" duration="695000" />
+      <workItem from="1688610318926" duration="5000" />
+      <workItem from="1688610355850" duration="5828000" />
+      <workItem from="1688949661834" duration="4497000" />
+      <workItem from="1689209473126" duration="3976000" />
     </task>
     <task id="LOCAL-00019" summary="1.wxJsAPIConfig对每个需要调用JS接口的URL签名加密;">
       <created>1669820396354</created>
@@ -589,7 +588,14 @@
       <option name="project" value="LOCAL" />
       <updated>1687781493891</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="1.邀请分享红包调整;">
+      <created>1688093049870</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1688093049870</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -635,7 +641,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.商家餐币提现;" />
     <MESSAGE value="1.删除定时任务:订单检查发放;" />
     <MESSAGE value="1.餐币钱包有效期90天;" />
     <MESSAGE value="1.餐币明细,客源信息;" />
@@ -660,7 +665,8 @@
     <MESSAGE value="1.redis db 15;" />
     <MESSAGE value="1.git;" />
     <MESSAGE value="1...;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1...;" />
+    <MESSAGE value="1.邀请分享红包调整;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.邀请分享红包调整;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

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

@@ -22,7 +22,7 @@ module.exports = class RelInviterController extends Base {
     // await that.changOpenid();
 
     // 2023/3/5 分佣发放
-    // that.service.commission.orderCommissionDispatchAfterPay(395);
+    that.service.commission.orderCommissionDispatchAfterPay(4);
 
     // 2023/3/5 餐币发放
     // const dispatchResult = that.service.diningCoin.orderDiningCoinDispatchAfterPay(362);

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

@@ -504,7 +504,7 @@ module.exports = class UserController extends shopController {
       attributes: [ 'partner_id' ],
     });
     if (!businessInfo || businessInfo.partner_id < 1) {
-      throw new Error('抱歉,您不是茅酱酒业的合作商户,无权收款。');
+      throw new Error('抱歉,您不是源森家具的合作商户,无权收款。');
     }
     const seq = that.app.Sequelize;
     const selectBean = await that.app.comoBean.instance({}, {

+ 1 - 1
app/service/commission.js

@@ -137,7 +137,7 @@ class CommissionService extends BaseService {
           });
           // 2022/11/18 记录分佣发放
           const logResult = await that.inviterCommissionLog(orderUserInfo, order.inviter_id, order.order_id,
-            1, commission, '邀请用户购酒分佣');
+            1, commission, '邀请用户下单分佣');
           commission_log_id = logResult.log_id;
         }
       }

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