clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

订单商品

This commit is contained in:
clunt 2022-05-16 22:35:25 +08:00
parent 1f39b536d2
commit 7d5b57c303
10 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
View File

@ -52,7 +52,7 @@ public class GoodsDeptCategoryController extends BaseController {
@PostMapping("/listByStep")
@ResponseBody
public AjaxResult listByStep(DeptGoodsCategory deptGoodsCategory) {
public AjaxResult listByStep(@RequestBody DeptGoodsCategory deptGoodsCategory) {
try {
return AjaxResult.success(deptGoodsCategoryService.listByStep(deptGoodsCategory));
}catch (Exception e){

14
ghy-admin/src/main/java/com/ghy/web/controller/system/SysAreaController.java
View File

@ -30,10 +30,10 @@ public class SysAreaController extends BaseController {
@Resource
private ISysAreaService sysAreaService;
@RequiresPermissions("system:area:list")
// @RequiresPermissions("system:area:list")
@PostMapping("/list")
@ResponseBody
public List<SysArea> list(SysArea sysArea)
public List<SysArea> list(@RequestBody SysArea sysArea)
{
List<SysArea> areaList = sysAreaService.selectSysAreaList(sysArea);
return areaList;
@ -43,10 +43,10 @@ public class SysAreaController extends BaseController {
* 新增保存区域
*/
@Log(title = "区域管理", businessType = BusinessType.INSERT)
@RequiresPermissions("system:area:add")
// @RequiresPermissions("system:area:add")
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(@Validated SysArea sysArea)
public AjaxResult addSave(@Validated @RequestBody SysArea sysArea)
{
if (UserConstants.AREA_CODE_NOT_UNIQUE.equals(sysAreaService.checkAreaCodeUnique(sysArea)))
{
@ -60,10 +60,10 @@ public class SysAreaController extends BaseController {
* 修改保存区域
*/
@Log(title = "区域管理", businessType = BusinessType.UPDATE)
@RequiresPermissions("system:area:edit")
// @RequiresPermissions("system:area:edit")
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(@Validated SysArea sysArea)
public AjaxResult editSave(@Validated @RequestBody SysArea sysArea)
{
if (UserConstants.AREA_CODE_NOT_UNIQUE.equals(sysAreaService.checkAreaCodeUnique(sysArea)))
{
@ -77,7 +77,7 @@ public class SysAreaController extends BaseController {
* 删除
*/
@Log(title = "区域管理", businessType = BusinessType.DELETE)
@RequiresPermissions("system:area:remove")
// @RequiresPermissions("system:area:remove")
@GetMapping("/remove/{areaId}")
@ResponseBody
public AjaxResult remove(@PathVariable("areaId") Long areaId)

1
ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java
View File

@ -282,6 +282,7 @@ public class ShiroConfig
filterChainDefinitionMap.put("/goods/**", "anon");
filterChainDefinitionMap.put("/tool/**", "anon");
filterChainDefinitionMap.put("/adapay/**", "anon");
filterChainDefinitionMap.put("/system/area/**", "anon");
filterChainDefinitionMap.put("/MP_verify_bRFuvYpyQ4WLr0on.txt", "anon");
// 对静态资源设置匿名访问
filterChainDefinitionMap.put("/favicon.ico**", "anon");

15
ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java
View File

@ -1,15 +0,0 @@
package com.ghy.order.domain;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author clunt
* 拆单后细单关联商品
*/
@Data
public class OrderDetailGoods extends BaseEntity {
}

41
ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java Normal file
View File

@ -0,0 +1,41 @@
package com.ghy.order.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* @author clunt
* 订单关联商品，即所有商品清单
*/
@Data
public class OrderGoods extends BaseEntity {
private static final long serialVersionUID = 1L;
@Excel(name = "订单商品id")
private Long orderGoodsId;
@Excel(name = "订单id, 可以为主单或者细单", cellType = Excel.ColumnType.NUMERIC)
private Long orderId;
@Excel(name = "商品id", cellType = Excel.ColumnType.NUMERIC)
private Long goodsId;
@Excel(name = "商品名称", cellType = Excel.ColumnType.STRING)
private String goodsName;
@Excel(name = "商品数量", cellType = Excel.ColumnType.NUMERIC)
private Integer goodsNum;
@Excel(name = "已服务数量", cellType = Excel.ColumnType.NUMERIC)
private Integer serverGoodsNum;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
}

15
ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java
View File

@ -1,15 +0,0 @@
package com.ghy.order.domain;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author clunt
* 主单关联商品，即所有商品清单
*/
@Data
public class OrderMasterGoods extends BaseEntity {
private static final long serialVersionUID = 1L;
}

4
ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java Normal file
View File

@ -0,0 +1,4 @@
package com.ghy.order.mapper;
public interface OrderGoodsMapper {
}

4
ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java Normal file
View File

@ -0,0 +1,4 @@
package com.ghy.order.service;
public interface OrderGoodsService {
}

12
ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java Normal file
View File

@ -0,0 +1,12 @@
package com.ghy.order.service.impl;
import com.ghy.order.service.OrderGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class OrderGoodsServiceImpl implements OrderGoodsService {
}

3
ghy-system/src/main/resources/mapper/system/SysAreaMapper.xml
View File

@ -32,6 +32,9 @@
<select id="selectSysAreaList" parameterType="com.ghy.system.domain.SysArea" resultMap="SysAreaResult">
<include refid="selectSysArea" />
<where>
<if test="areaId != null and areaId != 0">
AND area_id = #{areaId}
</if>
<if test="areaCode != null and areaCode != ''">
AND area_code like concat('%', #{goodsCode}, '%')
</if>