From 00f3a60a31dd5f6bcc4a02f03beb15d91cd4b6f8 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 03 五月 2023 17:43:47 +0800
Subject: [PATCH] 小程序初步完成
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 4 +++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 6 ++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 10 +++++-----
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 8 ++++----
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 4 +++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java | 4 ++++
6 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
index 5f080d9..369625c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -83,4 +84,7 @@
*/
@PostMapping("/user/editUserInfo")
public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto);
+
+ @PostMapping("/config/getSysTag")
+ public R<SysTag> getSysTag(@RequestBody Long sysTagId);
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index 4b1828d..4cf7aa6 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.slf4j.Logger;
@@ -59,6 +60,11 @@
public R editUserInfo(AppEditUserDto appEditUserDto) {
return R.fail("更新用户信息失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<SysTag> getSysTag(Long sysTagId) {
+ return null;
+ }
};
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index c168846..984dd7d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @ClassName ShopController
@@ -22,7 +24,7 @@
@RequestMapping("/shop")
public class ShopController {
- @Autowired
+ @Resource
private ShopService shopService;
@InnerAuth
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 7b74d13..85710a6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -51,8 +51,8 @@
@Resource
private ShopCertificateService shopCertificateService;
- @Resource
- private RemoteConfigService configService;
+ /*@Resource
+ private RemoteConfigService configService;*/
@Resource
private RemoteUserService sysUserService;
@@ -138,12 +138,12 @@
for(String str : shopTagIdArray){
shopRelTag = new ShopRelTag();
tagid = Long.valueOf(str);
- sysTag = configService.getSysTag(tagid).getData();
+ //sysTag = configService.getSysTag(tagid).getData();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shop.getShopId());
shopRelTag.setTagId(tagid);
shopRelTagService.save(shopRelTag);
- shopTagSj.add(sysTag.getTagName());
+ //shopTagSj.add(sysTag.getTagName());
}
shop.setShopTags(shopTagSj.toString());
this.saveOrUpdate(shop);
@@ -303,7 +303,7 @@
StringJoiner shopTagSj = new StringJoiner(",");
for(String str : shopTagIdArray){
tagId = Long.valueOf(str);
- sysTag = configService.getSysTag(tagId).getData();
+ sysTag = sysUserService.getSysTag(tagId).getData();
shopRelTag = new ShopRelTag();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shopId);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index 08d25c8..fcc1f3e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.shop.mapper.shop.ShopMapper">
- <resultMap type="Shop" id="ShopResult">
+ <resultMap type="com.ruoyi.system.api.domain.poji.shop.Shop" id="ShopResult">
<result property="shopId" column="shop_id" />
<result property="delFlag" column="del_flag" />
<result property="shopStatus" column="shop_status" />
@@ -57,7 +57,7 @@
select shop_id, del_flag, shop_status, create_time, create_user_id, update_time, update_user_id, shop_name, shop_number, shop_type, business_start_time, business_end_time, shopowner_name, shopowner_phone, sign_time, sign_province_code, sign_city_code, sign_area_code, sign_area_name, shop_service_phone, belong_user_id, belong_shop_id, supporting_capacity_flag, operation_person_flag, executive_force_flag, pattern_flag, connection_flag, economic_ability_flag, relation_partner, business_history, shop_province_code, shop_city_code, shop_area_code, shop_area_name, shop_address, shop_longitude, shop_latitude, shop_detail, marketing_function_flag, platform_coupon_flag, platform_birthday_flag, shop_custom_status, recommend_person, cooperation_end_time, cooperation_start_time, shop_tags, sign_user_id, shop_source from t_shop
</sql>
- <select id="selectShopList" parameterType="Shop" resultMap="ShopResult">
+ <select id="selectShopList" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop" resultMap="ShopResult">
<include refid="selectShopVo"/>
<where>
<if test="shopStatus != null "> and shop_status = #{shopStatus}</if>
@@ -112,7 +112,7 @@
where shop_id = #{shopId}
</select>
- <insert id="insertShop" parameterType="Shop" useGeneratedKeys="true" keyProperty="shopId">
+ <insert id="insertShop" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop" useGeneratedKeys="true" keyProperty="shopId">
insert into t_shop
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="delFlag != null">del_flag,</if>
@@ -214,7 +214,7 @@
</trim>
</insert>
- <update id="updateShop" parameterType="Shop">
+ <update id="updateShop" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop">
update t_shop
<trim prefix="SET" suffixOverrides=",">
<if test="delFlag != null">del_flag = #{delFlag},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
index 9fe89c8..4b1ec1b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
@@ -7,6 +7,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @version 1.0
@@ -18,7 +20,7 @@
@RequestMapping("/config")
public class ConfigController {
- @Autowired
+ @Resource
private SysTagService sysTagService;
@InnerAuth
--
Gitblit v1.7.1