Merge branch 'feature/mall_product_new'

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java

@@ -51,4 +51,7 @@ public class ShippingTemplatesFreeRespVO implements Serializable {
 
     @Schema(description = "分组唯一值", required = true)
     private String uniqid;
+
+    @Schema(description = "城市名称描述")
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java

@@ -39,4 +39,7 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable {
 
     @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
     private String provinceId;
+
+    @Schema(description = "城市名称描述", required = true)
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java

@@ -58,4 +58,7 @@ public class ShippingTemplatesRegionRespVO implements Serializable {
     @Schema(description = "分组唯一值", required = true)
     private String uniqid;
 
+    @Schema(description = "城市名称描述")
+    private String title;
+
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java

@@ -69,4 +69,9 @@ public class ShippingTemplatesFreeDO implements Serializable {
      *是否无效
      */
     private Boolean status;
+
+    /**
+     * 城市名称描述
+     */
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java

@@ -50,5 +50,10 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable {
      */
     private String uniqid;
 
+    /**
+     * 城市名称描述
+     */
+    private String title;
+
 
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java

@@ -81,5 +81,10 @@ public class ShippingTemplatesRegionDO implements Serializable {
      */
     private Boolean status;
 
+    /**
+     * 城市名称描述
+     */
+    private String title;
+
 
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java

@@ -44,7 +44,7 @@ public class RechargeOrderDO extends TenantBaseDO {
     /**
      * 用户id
      */
-    private Integer uid;
+    private Long uid;
     /**
      * 用户姓名
      */

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java

@@ -67,7 +67,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
             for (Integer cityId: cityIdList) {
                 ShippingTemplatesFreeDO shippingTemplatesFreeDO = new ShippingTemplatesFreeDO();
                 shippingTemplatesFreeDO.setCityId(cityId);
-//                shippingTemplatesFreeDO.setTitle(shippingTemplatesFreeRespVO.getTitle());
+                shippingTemplatesFreeDO.setTitle(shippingTemplatesFreeRespVO.getTitle());
                 shippingTemplatesFreeDO.setUniqid(uniqueKey);
                 shippingTemplatesFreeDO.setTempId(tempId);
                 shippingTemplatesFreeDO.setType(type);

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java

@@ -50,6 +50,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
         for (Integer cityId: cityIdList) {
             ShippingTemplatesNoDeliveryDO shippingTemplatesNoDeliveryDO = new ShippingTemplatesNoDeliveryDO();
             shippingTemplatesNoDeliveryDO.setCityId(cityId);
+            shippingTemplatesNoDeliveryDO.setTitle(shippingTemplatesNoDeliveryRespVOS.getTitle());
             shippingTemplatesNoDeliveryDO.setUniqid(uniqueKey);
             shippingTemplatesNoDeliveryDO.setTempId(tempId);
             shippingTemplatesNoDeliveryDOS.add(shippingTemplatesNoDeliveryDO);

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java

@@ -79,7 +79,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
                 ShippingTemplatesRegionDO shippingTemplatesRegionDO = new ShippingTemplatesRegionDO();
                 shippingTemplatesRegionDO.setCityId(cityId);
                 shippingTemplatesRegionDO.setUniqid(uniqueKey);
-//                shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle());
+                shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle());
                 shippingTemplatesRegionDO.setRenewal(shippingTemplatesRegionRespVO.getRenewal());
                 shippingTemplatesRegionDO.setRenewalPrice(shippingTemplatesRegionRespVO.getRenewalPrice());
                 shippingTemplatesRegionDO.setFirst(shippingTemplatesRegionRespVO.getFirst());

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

@@ -1408,7 +1408,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
         RechargeOrderDO orderDO = new RechargeOrderDO();
         List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos();
         orderDO.setOrderId(code);
-        orderDO.setUid(user.getId().intValue());
+        orderDO.setUid(user.getId());
         orderDO.setRealName(user.getNickname());
         orderDO.setUserPhone(StringUtils.isEmpty(request.getUserPhone()) ? user.getMobile() : request.getUserPhone());
         orderDO.setConfirmPhone(StringUtils.isEmpty(request.getConfirmPhone()) ? user.getMobile() : request.getConfirmPhone());

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, title, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
 
     <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, title, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-ui-app/config/app.js

@@ -1,6 +1,6 @@
 
 let domain = 'http://api.cyywl.top'
-// let domain = 'http://192.168.1.188:48080'
+// let domain = 'http://192.168.1.147:48080'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
@@ -8,7 +8,7 @@ module.exports = {
 		HTTP_REQUEST_URL: domain,
 	// #endif
 	HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址，上传图片用
-  // HTTP_ADMIN_URL:'http://192.168.1.188:48080', //PC后台的API请求地址，上传图片用
+  // HTTP_ADMIN_URL:'http://192.168.1.147:48080', //PC后台的API请求地址，上传图片用
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,

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

@@ -87,7 +87,7 @@
       };
     },
 
-    async onLoad() {
+    async onShow() {
       try{
         uni.showLoading({
         	title: '加载中',

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

@@ -99,7 +99,7 @@
       };
     },
     computed: mapGetters(['userInfo']),
-   async onLoad() {
+   async onShow() {
      const resful = await memberGradeInfo()
           if(resful.data.some((item) => !!parseInt(item.isExist))){
             uni.setTabBarItem({

yudao-ui-app/pages/users/user_spread_code/index.vue

@@ -77,6 +77,7 @@
              quality: 0.95,
              cacheBust: true
            });
+           console.log('i', i)
         }
         htmlToImage.toPng(document.getElementById('poster-wrap'), {
             quality: 0.95,