Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java

@@ -135,6 +135,8 @@ public class WxPayNotifyController {
                     log.error("支付金额不匹配,订单实际支付金额:{},微信入参验证金额:{}", orderDO.getPayPrice(), payerTotal);
                     return "failure";
                 }
+                orderDO.setRefundStatus(2);
+                rechargeOrderMapper.updateById(orderDO);
                 // 修改订单状态
                 // 写入
                 response.setStatus(HttpServletResponse.SC_OK);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java

@@ -9,10 +9,9 @@ import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*;
 import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
 import cn.iocoder.yudao.module.system.service.tenant.TenantService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-import me.chanjar.weixin.mp.api.WxMpService;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,7 +22,6 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

yudao-ui-app/App.vue

@@ -31,15 +31,14 @@
       id: 0
     },
     onLaunch: function(option) {
-      const res =  memberGradeInfo().then((res) =>{
+      // const res =  memberGradeInfo().then((res) =>{
-        if(res.data.some((item) => !!parseInt(item.isExist))){
+      //   if(res.data.some((item) => !!parseInt(item.isExist))){
-          uni.setTabBarItem({
+      //     uni.setTabBarItem({
-            index: 2,
+      //       index: 2,
-            text: 'text',
+      //       pagePath: '/pages/member_equity/index'
-            pagePath: '/pages/member_equity/index'
+      //     })
-          })
+      //   }
-        }
+      // })
-      })
 
       let that = this;
       // #ifdef H5

yudao-ui-app/components/paymentMember/index.vue

@@ -88,9 +88,10 @@
             },
             function(res) {
               if (res.err_msg == "get_brand_wcpay_request:ok") {
-                uni.switchTab({
+                window.location.reload()
-                  url: '/pages/member_application/index'
+                // uni.switchTab({
-                })
+                //   url: '/pages/member_application/index'
+                // })
               }
             })
         }

yudao-ui-app/pages/member_application/index.vue

@@ -101,6 +101,15 @@
     },
     async onLoad() {
       const res = await memberGradeInfo()
+      if(res.data.some((item) => !!parseInt(item.isExist))){
+        uni.setTabBarItem({
+          index: 2,
+          pagePath: '/pages/member_equity/index'
+        })
+        uni.switchTab({
+          url:'/pages/member_equity/index'
+        })
+      }
       this.memberData = res.data
     },
     methods: {
@@ -235,13 +244,12 @@
 
       .box-title {
         position: absolute;
-        top: -5.5%;
+        top: -37rpx;
         left: -203rpx;
         margin-left: 50%;
-
         image {
           width: 406rpx;
-          height: 87rpx;
+          height: 88rpx;
           position: relative;
           display: flex;
           align-items: center;
@@ -399,13 +407,13 @@
 
       .box-title {
         position: absolute;
-        top: -9%;
+        top: -37rpx;
         left: -203rpx;
         margin-left: 50%;
 
         image {
           width: 406rpx;
-          height: 87rpx;
+          height: 88rpx;
           position: relative;
           display: flex;
           align-items: center;

yudao-ui-app/pages/member_equity/index.vue

@@ -141,7 +141,7 @@
     background-repeat: no-repeat;
     background-attachment: fixed;
 
-    
+
 
     .box-member {
       padding: 36rpx 40rpx;

yudao-ui-app/pages/member_others/index.vue

@@ -247,13 +247,13 @@
 
       .box-title {
         position: absolute;
-        top: -5.5%;
+        top: -37rpx;
         left: -203rpx;
         margin-left: 50%;
 
         image {
           width: 406rpx;
-          height: 87rpx;
+          height: 88rpx;
           position: relative;
           display: flex;
           align-items: center;

yudao-ui-app/pages/member_record/index.vue

@@ -44,7 +44,6 @@
         }
       })
       this.memberData = arr
-      console.log(this.memberData)
     },
     watch:{
       keyword :Debounce (function (){

yudao-ui-app/pages/member_renew/index.vue

@@ -223,13 +223,13 @@ import store from '@/store/index';
 
      .box-title {
        position: absolute;
-       top: -5.5%;
+        top: -37rpx;
        left: -203rpx;
        margin-left: 50%;
 
        image {
          width: 406rpx;
-         height: 87rpx;
+         height: 88rpx;
          position: relative;
          display: flex;
          align-items: center;