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 { @@ -53,7 +53,7 @@ public class BuyerPenalty {
53 @Data 53 @Data
54 private static class StagedCollection{ 54 private static class StagedCollection{
55 55
56 - @MetaProperty(desc = "排序",rootGroup ="预售规则", childGroup ="仓库收货前",type = "int") 56 + @MetaProperty(desc = "排序",rootGroup ="预售规则", childGroup ="仓库收货前",type = "int",readOnly = true)
57 private Integer index; 57 private Integer index;
58 58
59 private MoneyRange moneyRange; 59 private MoneyRange moneyRange;
@@ -102,7 +102,7 @@ public class BuyerPenalty { @@ -102,7 +102,7 @@ public class BuyerPenalty {
102 @Data 102 @Data
103 private static class StagedCollection{ 103 private static class StagedCollection{
104 104
105 - @MetaProperty(desc = "排序",rootGroup ="预售规则" ,childGroup = "卖家发货前",type = "int") 105 + @MetaProperty(desc = "排序",rootGroup ="预售规则" ,childGroup = "卖家发货前",type = "int",readOnly = true)
106 private Integer index; 106 private Integer index;
107 107
108 @MetaProperty(desc = "比例",rootGroup ="预售规则" ,childGroup = "卖家发货前",scale = true) 108 @MetaProperty(desc = "比例",rootGroup ="预售规则" ,childGroup = "卖家发货前",scale = true)
@@ -167,7 +167,7 @@ public class BuyerPenalty { @@ -167,7 +167,7 @@ public class BuyerPenalty {
167 @Data 167 @Data
168 private static class StagedCollection{ 168 private static class StagedCollection{
169 169
170 - @MetaProperty(desc = "排序", rootGroup = "现货规则", childGroup = "仓库收货前",type = "int") 170 + @MetaProperty(desc = "排序", rootGroup = "现货规则", childGroup = "仓库收货前",type = "int",readOnly = true)
171 private Integer index; 171 private Integer index;
172 172
173 @MetaProperty(desc = "比例", rootGroup = "现货规则", childGroup = "仓库收货前",scale = true) 173 @MetaProperty(desc = "比例", rootGroup = "现货规则", childGroup = "仓库收货前",scale = true)
@@ -215,7 +215,7 @@ public class BuyerPenalty { @@ -215,7 +215,7 @@ public class BuyerPenalty {
215 @Data 215 @Data
216 private static class StagedCollection{ 216 private static class StagedCollection{
217 217
218 - @MetaProperty(desc = "排序",rootGroup = "现货规则", childGroup = "卖家发货前",type = "int") 218 + @MetaProperty(desc = "排序",rootGroup = "现货规则", childGroup = "卖家发货前",type = "int",readOnly = true)
219 private Integer index; 219 private Integer index;
220 220
221 @MetaProperty(desc = "比例",rootGroup = "现货规则", childGroup = "卖家发货前",scale = true) 221 @MetaProperty(desc = "比例",rootGroup = "现货规则", childGroup = "卖家发货前",scale = true)
@@ -46,7 +46,7 @@ public class SellerPenalty { @@ -46,7 +46,7 @@ public class SellerPenalty {
46 @Data 46 @Data
47 private static class StagedCollection{ 47 private static class StagedCollection{
48 48
49 - @MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "排序",type = "int") 49 + @MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "排序",type = "int",readOnly = true)
50 private Integer index; 50 private Integer index;
51 51
52 @MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "处罚比例",scale = true) 52 @MetaProperty(rootGroup = "预售处罚规则",childGroup = "卖家发货前",desc = "处罚比例",scale = true)
1 package com.yoho.ufo.order.controller; 1 package com.yoho.ufo.order.controller;
2 2
3 -import com.yoho.core.rest.client.ServiceCaller;  
4 import com.yoho.order.model.MetaConfig; 3 import com.yoho.order.model.MetaConfig;
5 import com.yoho.order.model.MetaConfigReq; 4 import com.yoho.order.model.MetaConfigReq;
6 import com.yoho.service.model.order.response.PageResponse; 5 import com.yoho.service.model.order.response.PageResponse;
7 import com.yoho.ufo.order.service.IMetaConfigService; 6 import com.yoho.ufo.order.service.IMetaConfigService;
8 import com.yoho.ufo.service.model.ApiResponse; 7 import com.yoho.ufo.service.model.ApiResponse;
  8 +import org.slf4j.Logger;
  9 +import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.web.bind.annotation.RequestMapping; 11 import org.springframework.web.bind.annotation.RequestMapping;
11 import org.springframework.web.bind.annotation.RestController; 12 import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +23,8 @@ public class MetaConfigController { @@ -22,6 +23,8 @@ public class MetaConfigController {
22 @Autowired 23 @Autowired
23 private IMetaConfigService metaConfigService; 24 private IMetaConfigService metaConfigService;
24 25
  26 + private Logger LOGGER = LoggerFactory.getLogger(MetaConfigController.class);
  27 +
25 /** 28 /**
26 * 分页查询配置项 29 * 分页查询配置项
27 * @param metaConfigReq 30 * @param metaConfigReq
@@ -29,6 +32,7 @@ public class MetaConfigController { @@ -29,6 +32,7 @@ public class MetaConfigController {
29 */ 32 */
30 @RequestMapping(value = "/list") 33 @RequestMapping(value = "/list")
31 public ApiResponse list(MetaConfigReq metaConfigReq){ 34 public ApiResponse list(MetaConfigReq metaConfigReq){
  35 + LOGGER.info("MetaConfigController.list in. req is {}", metaConfigReq);
32 PageResponse<MetaConfig> pageResponse = this.metaConfigService.list(metaConfigReq); 36 PageResponse<MetaConfig> pageResponse = this.metaConfigService.list(metaConfigReq);
33 return new ApiResponse.ApiResponseBuilder().code(200).data(pageResponse).build(); 37 return new ApiResponse.ApiResponseBuilder().code(200).data(pageResponse).build();
34 } 38 }
@@ -40,6 +44,7 @@ public class MetaConfigController { @@ -40,6 +44,7 @@ public class MetaConfigController {
40 */ 44 */
41 @RequestMapping(value = "/detail") 45 @RequestMapping(value = "/detail")
42 public ApiResponse getOne(String code){ 46 public ApiResponse getOne(String code){
  47 + LOGGER.info("MetaConfigController.getOne in. code is {}", code);
43 MetaConfig config = metaConfigService.selectByCode(code); 48 MetaConfig config = metaConfigService.selectByCode(code);
44 return new ApiResponse.ApiResponseBuilder().code(200).data(config).build(); 49 return new ApiResponse.ApiResponseBuilder().code(200).data(config).build();
45 } 50 }
@@ -51,6 +56,7 @@ public class MetaConfigController { @@ -51,6 +56,7 @@ public class MetaConfigController {
51 */ 56 */
52 @RequestMapping(value = "/update") 57 @RequestMapping(value = "/update")
53 public ApiResponse update(MetaConfig metaConfig){ 58 public ApiResponse update(MetaConfig metaConfig){
  59 + LOGGER.info("MetaConfigController.update in. req is {} ",metaConfig);
54 return metaConfigService.updateByPrimaryKey(metaConfig); 60 return metaConfigService.updateByPrimaryKey(metaConfig);
55 } 61 }
56 } 62 }