Merge remote-tracking branch 'origin/master'

tour-api/src/main/resources/application-dev.yml

@@ -126,8 +126,8 @@ alipay:
   successUrl: http://test.youpin.api.ydd100.cn:9000/mall/order/success.html
 
 wechat:
-  appId: wx1061d8cde0c78001
-  mchKey: 55894f57758b9304d428005f0ad89792
+  appId: wx61e5f94d7d793eda
+  mchKey: f2f4b47947e37f399684eabe78860186
   mchId: 1624836978
   notifyUrl: http://153.37.175.42:9092/api/wechat/pay/notify
 

tour-module/src/main/java/com/tour/module/domain/Member.java

@@ -46,10 +46,6 @@ private static final long serialVersionUID=1L;
     @Excel(name = "昵称")
     private String nickName;
 
-    /** 个人推荐码 */
-    @Excel(name = "个人推荐码")
-    private String recommendCode;
-
     /** 头像 */
     @Excel(name = "头像")
     private String avatar;

tour-module/src/main/java/com/tour/module/service/impl/MemberServiceImpl.java

@@ -34,9 +34,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         if (StringUtils.isNotBlank(member.getNickName())){
             lqw.like(Member::getNickName ,member.getNickName());
         }
-        if (StringUtils.isNotBlank(member.getRecommendCode())){
-            lqw.eq(Member::getRecommendCode ,member.getRecommendCode());
-        }
         if (StringUtils.isNotBlank(member.getAvatar())){
             lqw.eq(Member::getAvatar ,member.getAvatar());
         }
@@ -75,7 +72,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     public Member getMemberByMobile(String mobile) {
-        return baseMapper.selectOne(new QueryWrapper<Member>().eq("del_flag",0).eq("mobile", mobile));
+        return baseMapper.selectOne(new QueryWrapper<Member>().eq("mobile", mobile));
     }
 
 }

web-ui/src/views/module/agent/index.vue

@@ -183,11 +183,11 @@
         </el-form-item>
         <el-form-item :label="form.type == 0 ? '佣金比例' : '佣金金额'" prop="commissonRate">
           <div v-if="form.type == 0">
-            <el-input-number :disabled="this.title == '修改服务商'" style="width:330px" :min="0"  controls-position="right"  v-model="form.commissionRate" :placeholder="'可输入佣金比率范围0~100'">
+            <el-input-number :disabled="this.title == '修改服务商'" style="width:330px" :min="0"  controls-position="right"  v-model="form.commissonRate" :placeholder="'可输入佣金比率范围0~100'">
             </el-input-number> %
           </div>
           <div v-if="form.type == 1">
-            <el-input-number :disabled="this.title == '修改服务商'" style="width:330px" :min="0"  controls-position="right"  :precision="2" v-model="form.commissionRate" :placeholder="'可输入佣金金额'">
+            <el-input-number :disabled="this.title == '修改服务商'" style="width:330px" :min="0"  controls-position="right"  :precision="2" v-model="form.commissonRate" :placeholder="'可输入佣金金额'">
             </el-input-number> 元
           </div>
         </el-form-item>
@@ -481,7 +481,7 @@ export default {
         cityId: undefined,
         districtId: undefined,
         agentLevel: undefined,
-        commissionRate: undefined,
+        commissonRate: undefined,
         contactName: undefined,
         avatar: undefined,
         mobile: undefined,
@@ -493,10 +493,7 @@ export default {
         isPid: undefined,
         remark: undefined,
         type: 0,
-        huolalaCommission: undefined,
-        bindingThirdCommission: undefined,
-        packageDiscountId: undefined,
-        packageCommissionid: undefined,
+       
         validStartDate: undefined,
         validEndDate: undefined
       };