ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit dafc72e56599402f781474c135ba196257a54593 2 parents 96a9167f e50f5c9b

Merge branch 'test6.9.17' of http://git.yoho.cn/ufo/ufo-platform into test6.9.17

Inline Side-by-side
Showing 3 changed files with 12 additions and 6 deletions
... ... @@ -53,7 +53,7 @@ public class BuyerPenalty {
@Data
private static class StagedCollection{
@MetaProperty(desc = "排序",rootGroup ="预售规则", childGroup ="仓库收货前",type = "int")
@MetaProperty(desc = "排序",rootGroup ="预售规则", childGroup ="仓库收货前",type = "int",readOnly = true)
private Integer index;
private MoneyRange moneyRange;
... ... @@ -102,7 +102,7 @@ public class BuyerPenalty {
@Data
private static class StagedCollection{
@MetaProperty(desc = "排序",rootGroup ="预售规则" ,childGroup = "卖家发货前",type = "int")
@MetaProperty(desc = "排序",rootGroup ="预售规则" ,childGroup = "卖家发货前",type = "int",readOnly = true)
private Integer index;
@MetaProperty(desc = "比例",rootGroup ="预售规则" ,childGroup = "卖家发货前",scale = true)
... ... @@ -167,7 +167,7 @@ public class BuyerPenalty {
@Data
private static class StagedCollection{
@MetaProperty(desc = "排序", rootGroup = "现货规则", childGroup = "仓库收货前",type = "int")
@MetaProperty(desc = "排序", rootGroup = "现货规则", childGroup = "仓库收货前",type = "int",readOnly = true)
private Integer index;
@MetaProperty(desc = "比例", rootGroup = "现货规则", childGroup = "仓库收货前",scale = true)
... ... @@ -215,7 +215,7 @@ public class BuyerPenalty {
@Data
private static class StagedCollection{
@MetaProperty(desc = "排序",rootGroup = "现货规则", childGroup = "卖家发货前",type = "int")
@MetaProperty(desc = "排序",rootGroup = "现货规则", childGroup = "卖家发货前",type = "int",readOnly = true)
private Integer index;
@MetaProperty(desc = "比例",rootGroup = "现货规则", childGroup = "卖家发货前",scale = true)
... ...
... ... @@ -46,7 +46,7 @@ public class SellerPenalty {
@Data
private static class StagedCollection{
@MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "排序",type = "int")
@MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "排序",type = "int",readOnly = true)
private Integer index;
@MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "处罚比例",scale = true)
... ...
package com.yoho.ufo.order.controller;
import com.yoho.core.rest.client.ServiceCaller;
import com.yoho.order.model.MetaConfig;
import com.yoho.order.model.MetaConfigReq;
import com.yoho.service.model.order.response.PageResponse;
import com.yoho.ufo.order.service.IMetaConfigService;
import com.yoho.ufo.service.model.ApiResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
... ... @@ -22,6 +23,8 @@ public class MetaConfigController {
@Autowired
private IMetaConfigService metaConfigService;
private Logger LOGGER = LoggerFactory.getLogger(MetaConfigController.class);
/**
* 分页查询配置项
* @param metaConfigReq
... ... @@ -29,6 +32,7 @@ public class MetaConfigController {
*/
@RequestMapping(value = "/list")
public ApiResponse list(MetaConfigReq metaConfigReq){
LOGGER.info("MetaConfigController.list in. req is {}", metaConfigReq);
PageResponse<MetaConfig> pageResponse = this.metaConfigService.list(metaConfigReq);
return new ApiResponse.ApiResponseBuilder().code(200).data(pageResponse).build();
}
... ... @@ -40,6 +44,7 @@ public class MetaConfigController {
*/
@RequestMapping(value = "/detail")
public ApiResponse getOne(String code){
LOGGER.info("MetaConfigController.getOne in. code is {}", code);
MetaConfig config = metaConfigService.selectByCode(code);
return new ApiResponse.ApiResponseBuilder().code(200).data(config).build();
}
... ... @@ -51,6 +56,7 @@ public class MetaConfigController {
*/
@RequestMapping(value = "/update")
public ApiResponse update(MetaConfig metaConfig){
LOGGER.info("MetaConfigController.update in. req is {} ",metaConfig);
return metaConfigService.updateByPrimaryKey(metaConfig);
}
}
... ...