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

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java

@@ -1502,7 +1502,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
         rechargeGearDOList.forEach(rechargeGearDO -> {
             Boolean flag = phoneRecordService.verifyPhone(request.getUserPhone(), rechargeGearDO.getRefundAmount().intValue() + "");
             if (flag) {
-                throw new ServiceException(200, "该挡位:" + rechargeGearDO.getName() + "你已购买,一年内无法再次办理同套餐");
+                throw new ServiceException(200, rechargeGearDO.getName() + ",已办理套餐，一年内无法重复办理");
             }
         });
 
@@ -1516,7 +1516,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
             Map<Long, List<PhoneRecordDO>> collect1 = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
             orderInfos.forEach(info -> {
                 if (!CollectionUtils.isEmpty(collect1.get(info.getGearId()))) {
-                    throw new ServiceException(200, "该挡位:" + info.getName() + "你已购买,一年内无法再次办理同套餐");
+                    throw new ServiceException(200, info.getName() + ",已办理套餐，一年内无法重复办理");
                 }
             });
         }

yudao-ui-app/libs/pay.js

@@ -66,9 +66,9 @@ const unityPay = (options) => {
         _options.aliPaySuccess(payConfig.body)
         break
     }
-  }).catch(() => {
+  }).catch((error) => {
     util.Tips({
-      title: '预下单失败'
+      title: error
     })
   }).finally(uni.hideLoading)
 }

yudao-ui-app/package.json

@@ -28,7 +28,7 @@
         "title": "生产版",
         "env": {
           "UNI_PLATFORM": "h5",
-          "isVConsole": true,
+          "isVConsole": false,
           "APP_BASE_URL": "http://api.cyywl.top"
         }
       }