cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.9.6,H5(公众号)端新增商品海报功能,管理后台配置新增排序与可隐藏选项，修复小程序bug等

Browse Source
This commit is contained in:
hupeng
2020-02-11 14:12:21 +08:00
parent 7e94789793
commit b954dcf6f2
8 changed files with 105 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java
View File

@ -13,7 +13,9 @@ import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@ -35,9 +37,13 @@ public class YxSystemGroupDataController {
@ApiOperation(value = "查询数据配置")
@GetMapping(value = "/yxSystemGroupData")
@PreAuthorize("@el.check('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_SELECT')")
public ResponseEntity getYxSystemGroupDatas(YxSystemGroupDataQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(yxSystemGroupDataService.queryAll(criteria,pageable),HttpStatus.OK);
public ResponseEntity getYxSystemGroupDatas(YxSystemGroupDataQueryCriteria criteria,
Pageable pageable){
Sort sort = new Sort(Sort.Direction.DESC, "sort");
Pageable pageableT = new PageRequest(pageable.getPageNumber(),
pageable.getPageSize(),
sort);
return new ResponseEntity(yxSystemGroupDataService.queryAll(criteria,pageableT),HttpStatus.OK);
}
@Log("新增数据配置")
@ -77,7 +83,8 @@ public class YxSystemGroupDataController {
yxSystemGroupData.setGroupName(jsonObject.get("groupName").toString());
jsonObject.remove("groupName");
yxSystemGroupData.setValue(jsonObject.toJSONString());
yxSystemGroupData.setStatus(1);
yxSystemGroupData.setStatus(jsonObject.getInteger("status"));
yxSystemGroupData.setSort(jsonObject.getInteger("sort"));
yxSystemGroupData.setAddTime(OrderUtil.getSecondTimestampTwo());
return new ResponseEntity(yxSystemGroupDataService.create(yxSystemGroupData),HttpStatus.CREATED);
@ -113,6 +120,19 @@ public class YxSystemGroupDataController {
yxSystemGroupData.setGroupName(jsonObject.get("groupName").toString());
jsonObject.remove("groupName");
yxSystemGroupData.setValue(jsonObject.toJSONString());
if(jsonObject.getInteger("status") == null){
yxSystemGroupData.setStatus(1);
}else{
yxSystemGroupData.setStatus(jsonObject.getInteger("status"));
}
if(jsonObject.getInteger("sort") == null){
yxSystemGroupData.setSort(0);
}else{
yxSystemGroupData.setSort(jsonObject.getInteger("sort"));
}
yxSystemGroupData.setId(Integer.valueOf(jsonObject.get("id").toString()));
yxSystemGroupDataService.update(yxSystemGroupData);
return new ResponseEntity(HttpStatus.NO_CONTENT);

1
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java
View File

@ -50,7 +50,6 @@ public class YxSystemGroupDataServiceImpl implements YxSystemGroupDataService {
map.put("content",systemGroupDataDTOS);
map.put("totalElements",page.getTotalElements());
return map;
//return PageUtil.toPage(page.map(yxSystemGroupDataMapper::toDto));
}
@Override

4
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java
View File

@ -33,7 +33,7 @@ public class YxSystemConfigController {
private YxSystemConfigService yxSystemConfigService;
@Log("查询")
@ApiOperation(value = "查询YxSystemConfig")
@ApiOperation(value = "查询")
@GetMapping(value = "/yxSystemConfig")
@PreAuthorize("@el.check('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_SELECT')")
public ResponseEntity getYxSystemConfigs(YxSystemConfigQueryCriteria criteria, Pageable pageable){
@ -41,7 +41,7 @@ public class YxSystemConfigController {
}
@Log("新增或修改")
@ApiOperation(value = "新增YxSystemConfig")
@ApiOperation(value = "新增或修改")
@PostMapping(value = "/yxSystemConfig")
@PreAuthorize("@el.check('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_CREATE')")
public ResponseEntity create(@RequestBody String jsonStr){