Commit 3ba27501 by zhiwj

达摩微商城

parent cff58dd3
......@@ -25,6 +25,7 @@
<gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
<gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
<gic-member-config-api>4.0-SNAPSHOT</gic-member-config-api>
<gic-mall-share-api>4.0-SNAPSHOT</gic-mall-share-api>
</properties>
<dependencies>
......@@ -165,6 +166,11 @@
<artifactId>gic-member-config-api</artifactId>
<version>${gic-member-config-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-mall-share-api</artifactId>
<version>${gic-mall-share-api}</version>
</dependency>
</dependencies>
<build>
......
......@@ -20,6 +20,9 @@ import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
import com.gic.goods.api.service.GoodsRightsSelectorApiService;
import com.gic.mall.share.api.dto.shop.ShopDTO;
import com.gic.mall.share.api.enums.ShopTypeEnum;
import com.gic.mall.share.api.service.ShopApiService;
import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
import com.gic.marketing.api.service.sms.SmsApiService;
import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
......@@ -32,7 +35,6 @@ import com.gic.open.api.dto.ApplicationDTO;
import com.gic.open.api.dto.ApplicationSubDTO;
import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.ApplicationSubApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -57,8 +59,6 @@ public class ResourceController {
@Autowired
private ResourceApiService resourceApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
@Autowired
private SmsApiService smsApiService;
......@@ -72,6 +72,8 @@ public class ResourceController {
private AppletsConfigApiService appletsConfigApiService;
@Autowired
private ServiceConfigApiService serviceConfigApiService;
@Autowired
private ShopApiService shopApiService;
@RequestMapping("/list-resource-app")
public RestResponse listResourceApp() {
......@@ -100,15 +102,15 @@ public class ResourceController {
return RestResponse.success(appVOList);
}
@RequestMapping("/list-sms-sign")
public RestResponse listSmsSign(String search) {
ServiceResponse<List<EnterpriseSmsSignDTO>> serviceResponse = smsApiService
.listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/list-sms-sign")
public RestResponse listSmsSign(String search) {
ServiceResponse<List<EnterpriseSmsSignDTO>> serviceResponse = smsApiService
.listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class,
......@@ -212,6 +214,12 @@ public class ResourceController {
return RestResponse.success(map);
}
@RequestMapping("/gic-shop-resource")
public RestResponse gicShopResource() {
ServiceResponse<List<ShopDTO>> serviceResponse = shopApiService.getAllShopByEnterpriseIdAndName(UserDetailUtils.getUserDetail().getEnterpriseId(), null, ShopTypeEnum.MALL_SHOP.getCode());
return ResultControllerUtils.commonResult(serviceResponse);
}
// private StoreResouceVO getStoreResouce(Integer storeWidgetId) {
// StoreResouceVO storeResouceVO = null;
// ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeWidgetId);
......
......@@ -77,4 +77,8 @@
<dubbo:reference interface="com.gic.member.config.api.service.AppletsConfigApiService" id="appletsConfigApiService" timeout="60000" />
<dubbo:reference interface="com.gic.member.config.api.service.ServiceConfigApiService" id="serviceConfigApiService" timeout="60000" />
<!-- 微商城 -->
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="ShopApiService" timeout="6000" />
</beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment