bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk 商超

This commit is contained in:
skjia 2025-04-23 22:37:03 +08:00
parent 64872c4ee8
commit ec75df799b
20 changed files with 577 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java
View File

@ -12,25 +12,29 @@ import org.springframework.stereotype.Service;
@Service
public class DeviceServiceImpl implements DeviceService {
@Autowired
private DeviceMapper mapper;
@Value("${face.android.appId}")
private String appId;
@Value("${face.android.sdkKey}")
private String appKey;
@Override
public AjaxResult getDeviceInfo(AppDTO dto) {
//判断设备是否存在
DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
if (deviceInfoVo == null){
return AjaxResult.error("设备不存在");
}
deviceInfoVo.setAppId(appId);
deviceInfoVo.setAppKey(appKey);
deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
return AjaxResult.success(deviceInfoVo);
return null;
}
// @Autowired
// private DeviceMapper mapper;
//
//
// @Value("${face.android.appId}")
// private String appId;
// @Value("${face.android.sdkKey}")
// private String appKey;
//
// @Override
// public AjaxResult getDeviceInfo(AppDTO dto) {
// //判断设备是否存在
// DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
// if (deviceInfoVo == null){
// return AjaxResult.error("设备不存在");
// }
// deviceInfoVo.setAppId(appId);
// deviceInfoVo.setAppKey(appKey);
// deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
// return AjaxResult.success(deviceInfoVo);
// }
}

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java
View File

@ -19,7 +19,7 @@ import java.util.List;
/**
* 超市Controller
*
* @author xsheng
* @author jsk
* @date 2025-04-05
*/
@Api(tags = "超市接口")
@ -30,6 +30,7 @@ public class SupermarketInfoController extends BaseController {
private SupermarketInfoService supermarketInfoService;
/**
* @author jsk
* 查询超市列表
*/
@ApiOperation(value = "查询超市列表")
@ -41,6 +42,7 @@ public class SupermarketInfoController extends BaseController {
}
/**
* @author jsk
* 新增超市
*/
@ApiOperation(value = "新增超市")
@ -57,6 +59,7 @@ public class SupermarketInfoController extends BaseController {
}
/**
* @author jsk
* 修改超市
*/
@ApiOperation(value = "修改超市")
@ -73,6 +76,7 @@ public class SupermarketInfoController extends BaseController {
}
/**
* @author jsk
* 删除超市
*/
@ApiOperation(value = "删除超市")

41
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java
View File

@ -18,7 +18,7 @@ import java.util.List;
/**
* 商品Controller
*
* @author xsheng
* @author jsk
* @date 2025-04-05
*/
@Api(tags = "商品接口")
@ -29,6 +29,7 @@ public class SupermarketProductController extends BaseController {
private SupermarketProductService supermarketProductService;
/**
* @author jsk
* 查询商品列表
*/
@ApiOperation(value = "查询商品列表")
@ -40,6 +41,19 @@ public class SupermarketProductController extends BaseController {
}
/**
* @author jsk
* 查询未入超市商品列表
*/
@ApiOperation(value = "查询未入超市商品列表")
@GetMapping("/nosupermarketlist")
public TableDataInfo nosupermarketlist(SupermarketProduct SupermarketProduct) {
startPage();
List<SupermarketProduct> list = supermarketProductService.selectNoSupermarketProductList(SupermarketProduct);
return getDataTable(list);
}
/**
* @author jsk
* 新增商品
*/
@ApiOperation(value = "新增商品")
@ -54,6 +68,22 @@ public class SupermarketProductController extends BaseController {
}
/**
* @author jsk
* 批量添加商品到超市
*/
@ApiOperation(value = "修改商品")
@SysLog(title = "商品", businessType = OperaType.UPDATE, logType = 1,module = "商超管理->修改商品")
@PostMapping("/editbatch")
public AjaxResult editbatch(@RequestBody SupermarketProduct SupermarketProduct) {
try {
return toAjax(supermarketProductService.updateBatchSupermarketProduct(SupermarketProduct));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* @author jsk
* 修改商品
*/
@ApiOperation(value = "修改商品")
@ -67,6 +97,7 @@ public class SupermarketProductController extends BaseController {
}
}
/**
* @author jsk
* 修改商品状态
*/
@ApiOperation(value = "修改商品状态")
@ -81,7 +112,8 @@ public class SupermarketProductController extends BaseController {
}
/**
* 删除商品
* @author jsk
* 批量删除商品
*/
@ApiOperation(value = "批量删除商品")
@SysLog(title = "商品", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除商品")
@ -89,6 +121,11 @@ public class SupermarketProductController extends BaseController {
public AjaxResult removes(@RequestBody SupermarketProduct supermarketProducts) {
return toAjax(supermarketProductService.deleteSupermarketProductByProductIds(supermarketProducts));
}
/**
* @author jsk
* 删除商品
*/
@ApiOperation(value = "删除商品")
@SysLog(title = "商品", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除商品")
@PostMapping("/del")

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketUnitController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
/**
* 单位Controller
*
* @author xsheng
* @author jsk
* @date 2025-04-05
*/
@Api(tags = "单位接口")
@ -28,6 +28,7 @@ public class SupermarketUnitController extends BaseController {
private SupermarketUnitService supermarketUnitService;
/**
* @author jsk
* 查询单位列表
*/
@ApiOperation(value = "查询单位列表")
@ -39,6 +40,7 @@ public class SupermarketUnitController extends BaseController {
}
/**
* @author jsk
* 新增单位
*/
@ApiOperation(value = "新增单位")
@ -53,6 +55,7 @@ public class SupermarketUnitController extends BaseController {
}
/**
* @author jsk
* 修改单位
*/
@ApiOperation(value = "修改单位")
@ -67,6 +70,7 @@ public class SupermarketUnitController extends BaseController {
}
/**
* @author jsk
* 删除单位
*/
@ApiOperation(value = "删除单位")

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java
View File

@ -21,6 +21,7 @@ public interface SupermarketProductMapper {
*/
public List<SupermarketProduct> selectSupermarketProductList(SupermarketProduct productInfo);
public List<SupermarketProduct> selectNoSupermarketProductList(SupermarketProduct productInfo);
/**
* 新增商品
*

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketProductService.java
View File

@ -20,6 +20,8 @@ public interface SupermarketProductService {
*/
public List<SupermarketProduct> selectSupermarketProductList(SupermarketProduct productInfo);
public List<SupermarketProduct> selectNoSupermarketProductList(SupermarketProduct productInfo);
/**
* 新增商品
*
@ -36,6 +38,8 @@ public interface SupermarketProductService {
*/
public int updateSupermarketProduct(SupermarketProduct productInfo);
public int updateBatchSupermarketProduct(SupermarketProduct productInfo);
public int updateSupermarketProductState(SupermarketProduct productInfo);
/**

20
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java
View File

@ -32,6 +32,10 @@ public class SupermarketProductServiceImpl implements SupermarketProductService
return supermarketProductMapper.selectSupermarketProductList(SupermarketProduct);
}
@Override
public List<SupermarketProduct> selectNoSupermarketProductList(SupermarketProduct SupermarketProduct) {
return supermarketProductMapper.selectNoSupermarketProductList(SupermarketProduct);
}
/**
* 新增商品
*
@ -64,6 +68,22 @@ public class SupermarketProductServiceImpl implements SupermarketProductService
}
}
@Override
public int updateBatchSupermarketProduct(SupermarketProduct supermarketProduct) {
supermarketProduct.setUpdateTime(DateUtils.getNowDate());
try {
int kk=0;
String[] productids=supermarketProduct.getProductId().split(",");
for(int i=0;i<productids.length;i++){
supermarketProduct.setProductId(productids[i]);
kk=supermarketProductMapper.updateSupermarketProduct(supermarketProduct);
}
return kk;
} catch (Exception e) {
throw new ServiceException("错误信息描述");
}
}
@Override
public int updateSupermarketProductState(SupermarketProduct SupermarketProduct) {
SupermarketProduct.setUpdateTime(DateUtils.getNowDate());

85
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseCategoryController.java Normal file
View File

@ -0,0 +1,85 @@
package com.bonus.canteen.core.warehouse.controller;
import com.bonus.canteen.core.warehouse.domain.WareHouseCategory;
import com.bonus.canteen.core.warehouse.service.WareHouseCategoryService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 库存类别Controller
*
* @author jsk
* @date 2025-04-05
*/
@Api(tags = "库存类别接口")
@RestController
@RequestMapping("/warehouse_category")
public class WareHouseCategoryController extends BaseController {
@Autowired
private WareHouseCategoryService wareHouseCategoryService;
/**
* @author jsk
* 查询库存类别列表
*/
@ApiOperation(value = "查询库存类别列表")
@GetMapping("/list")
public TableDataInfo list(WareHouseCategory WareHouseCategory) {
startPage();
List<WareHouseCategory> list = wareHouseCategoryService.selectWareHouseCategoryList(WareHouseCategory);
return getDataTable(list);
}
/**
* @author jsk
* 新增库存类别
*/
@ApiOperation(value = "新增库存类别")
//@PreventRepeatSubmit
//@RequiresPermissions("WareHouse:info:add")
@SysLog(title = "库存类别", businessType = OperaType.INSERT, logType = 1,module = "库存管理->新增库存类别")
@PostMapping("/add")
public AjaxResult add(@RequestBody WareHouseCategory WareHouseCategory) {
try {
return toAjax(wareHouseCategoryService.insertWareHouseCategory(WareHouseCategory));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* @author jsk
* 修改库存类别
*/
@ApiOperation(value = "修改库存类别")
@SysLog(title = "库存类别", businessType = OperaType.UPDATE, logType = 1,module = "库存管理->修改库存类别")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody WareHouseCategory WareHouseCategory) {
try {
return toAjax(wareHouseCategoryService.updateWareHouseCategory(WareHouseCategory));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* @author jsk
* 删除库存类别
*/
@ApiOperation(value = "删除库存类别")
@SysLog(title = "库存类别", businessType = OperaType.DELETE, logType = 1,module = "库存管理->删除库存类别")
@PostMapping("/del")
public AjaxResult remove(@RequestBody WareHouseCategory WareHouseCategory) {
return toAjax(wareHouseCategoryService.deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory));
}
}

20
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseInfoController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
/**
* 仓库Controller
*
* @author xsheng
* @author jsk
* @date 2025-04-05
*/
@Api(tags = "仓库接口")
@ -28,6 +28,7 @@ public class WareHouseInfoController extends BaseController {
private WareHouseInfoService wareHouseInfoService;
/**
* @author jsk
* 查询仓库列表
*/
@ApiOperation(value = "查询仓库列表")
@ -39,12 +40,13 @@ public class WareHouseInfoController extends BaseController {
}
/**
* @author jsk
* 新增仓库
*/
@ApiOperation(value = "新增仓库")
//@PreventRepeatSubmit
//@RequiresPermissions("WareHouse:info:add")
@SysLog(title = "仓库", businessType = OperaType.INSERT, logType = 1,module = "商超管理->新增仓库")
@SysLog(title = "仓库", businessType = OperaType.INSERT, logType = 1,module = "库存管理->新增仓库")
@PostMapping("/add")
public AjaxResult add(@RequestBody WareHouseInfo WareHouseInfo) {
try {
@ -55,12 +57,11 @@ public class WareHouseInfoController extends BaseController {
}
/**
* @author jsk
* 修改仓库
*/
@ApiOperation(value = "修改仓库")
//@PreventRepeatSubmit
//@RequiresPermissions("WareHouse:info:edit")
@SysLog(title = "仓库", businessType = OperaType.UPDATE, logType = 1,module = "商超管理->修改仓库")
@SysLog(title = "仓库", businessType = OperaType.UPDATE, logType = 1,module = "库存管理->修改仓库")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody WareHouseInfo WareHouseInfo) {
try {
@ -71,15 +72,14 @@ public class WareHouseInfoController extends BaseController {
}
/**
* @author jsk
* 删除仓库
*/
@ApiOperation(value = "删除仓库")
//@PreventRepeatSubmit
//@RequiresPermissions("WareHouse:info:remove")
@SysLog(title = "仓库", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除仓库")
@SysLog(title = "仓库", businessType = OperaType.DELETE, logType = 1,module = "库存管理->删除仓库")
@PostMapping("/del")
public AjaxResult remove(@PathVariable Long WareHouseId) {
return toAjax(wareHouseInfoService.deleteWareHouseInfoByWareHouseId(WareHouseId));
public AjaxResult remove(@RequestBody WareHouseInfo WareHouseInfo) {
return toAjax(wareHouseInfoService.deleteWareHouseInfoByWareHouseId(WareHouseInfo));
}
}

28
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseCategory.java Normal file
View File

@ -0,0 +1,28 @@
package com.bonus.canteen.core.warehouse.domain;
import com.bonus.common.core.web.domain.BaseEntity;
import lombok.Data;
import lombok.ToString;
/**
* 超市对象 orderInfo
*
* @author xsheng
* @date 2025-04-05
*/
@Data
@ToString
public class WareHouseCategory extends BaseEntity {
private static final long serialVersionUID = 1L;
private String categoryId ;
private String areaId ;
private String areaName ;
private String categoryName ;
private String delFlag ;
private String createBy ;
private String updateBy ;
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseInfo.java
View File

@ -28,7 +28,8 @@ public class WareHouseInfo extends BaseEntity {
private String warehouseType ;
private String status ;
private String delFlag ;
private String typeId ;
private String categoryId ;
private String categoryName ;
private String areaId ;
private String revision ;
private String createBy ;
@ -38,5 +39,6 @@ public class WareHouseInfo extends BaseEntity {
private String parentId ;
private String canteenId ;
private String fetchUserId ;
private String userName ;
}

55
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseCategoryMapper.java Normal file
View File

@ -0,0 +1,55 @@
package com.bonus.canteen.core.warehouse.mapper;
import com.bonus.canteen.core.warehouse.domain.WareHouseCategory;
import java.util.List;
/**
* 仓库Mapper接口
*
* @author xsheng
* @date 2025-04-05
*/
public interface WareHouseCategoryMapper {
/**
* 查询仓库列表
*
* @param wareHouseCategory 仓库
* @return 仓库集合
*/
public List<WareHouseCategory> selectWareHouseCategoryList(WareHouseCategory wareHouseCategory);
/**
* 新增仓库
*
* @param wareHouseCategory 仓库
* @return 结果
*/
public int insertWareHouseCategory(WareHouseCategory wareHouseCategory);
/**
* 修改仓库
*
* @param wareHouseCategory 仓库
* @return 结果
*/
public int updateWareHouseCategory(WareHouseCategory wareHouseCategory);
/**
* 删除仓库
*
* @param wareHouseId 仓库主键
* @return 结果
*/
public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory);
/**
* 批量删除仓库
*
* @param wareHouseIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteWareHouseCategoryByWareHouseIds(Long[] wareHouseIds);
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseInfoMapper.java
View File

@ -40,10 +40,10 @@ public interface WareHouseInfoMapper {
/**
* 删除仓库
*
* @param wareHouseId 仓库主键
* @param WareHouseInfo 仓库主键
* @return 结果
*/
public int deleteWareHouseInfoByWareHouseId(Long wareHouseId);
public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo);
/**
* 批量删除仓库

54
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseCategoryService.java Normal file
View File

@ -0,0 +1,54 @@
package com.bonus.canteen.core.warehouse.service;
import com.bonus.canteen.core.warehouse.domain.WareHouseCategory;
import java.util.List;
/**
* 仓库Service接口
*
* @author xsheng
* @date 2025-04-05
*/
public interface WareHouseCategoryService {
/**
* 查询仓库列表
*
* @param wareHouseCategory 仓库
* @return 仓库集合
*/
public List<WareHouseCategory> selectWareHouseCategoryList(WareHouseCategory wareHouseCategory);
/**
* 新增仓库
*
* @param wareHouseCategory 仓库
* @return 结果
*/
public int insertWareHouseCategory(WareHouseCategory wareHouseCategory);
/**
* 修改仓库
*
* @param wareHouseCategory 仓库
* @return 结果
*/
public int updateWareHouseCategory(WareHouseCategory wareHouseCategory);
/**
* 批量删除仓库
*
* @param wareHouseIds 需要删除的仓库主键集合
* @return 结果
*/
public int deleteWareHouseCategoryByWareHouseIds(Long[] wareHouseIds);
/**
* 删除仓库信息
*
* @param wareHouseId 仓库主键
* @return 结果
*/
public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory);
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseInfoService.java
View File

@ -50,5 +50,5 @@ public interface WareHouseInfoService {
* @param wareHouseId 仓库主键
* @return 结果
*/
public int deleteWareHouseInfoByWareHouseId(Long wareHouseId);
public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo);
}

88
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseCategoryServiceImpl.java Normal file
View File

@ -0,0 +1,88 @@
package com.bonus.canteen.core.warehouse.service.impl;
import com.bonus.canteen.core.warehouse.domain.WareHouseCategory;
import com.bonus.canteen.core.warehouse.mapper.WareHouseCategoryMapper;
import com.bonus.canteen.core.warehouse.service.WareHouseCategoryService;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 仓库Service业务层处理
*
* @author xsheng
* @date 2025-04-05
*/
@Service
public class WareHouseCategoryServiceImpl implements WareHouseCategoryService {
@Autowired
private WareHouseCategoryMapper wareHouseCategoryMapper;
/**
* 查询仓库列表
*
* @param WareHouseCategory 仓库
* @return 仓库
*/
@Override
public List<WareHouseCategory> selectWareHouseCategoryList(WareHouseCategory WareHouseCategory) {
return wareHouseCategoryMapper.selectWareHouseCategoryList(WareHouseCategory);
}
/**
* 新增仓库
*
* @param WareHouseCategory 仓库
* @return 结果
*/
@Override
public int insertWareHouseCategory(WareHouseCategory WareHouseCategory) {
WareHouseCategory.setCreateTime(DateUtils.getNowDate());
try {
return wareHouseCategoryMapper.insertWareHouseCategory(WareHouseCategory);
} catch (Exception e) {
throw new ServiceException("错误信息描述");
}
}
/**
* 修改仓库
*
* @param WareHouseCategory 仓库
* @return 结果
*/
@Override
public int updateWareHouseCategory(WareHouseCategory WareHouseCategory) {
WareHouseCategory.setUpdateTime(DateUtils.getNowDate());
try {
return wareHouseCategoryMapper.updateWareHouseCategory(WareHouseCategory);
} catch (Exception e) {
throw new ServiceException("错误信息描述");
}
}
/**
* 批量删除仓库
*
* @param WareHouseIds 需要删除的仓库主键
* @return 结果
*/
@Override
public int deleteWareHouseCategoryByWareHouseIds(Long[] WareHouseIds) {
return wareHouseCategoryMapper.deleteWareHouseCategoryByWareHouseIds(WareHouseIds);
}
/**
* 删除仓库信息
*
* @param WareHouseId 仓库主键
* @return 结果
*/
@Override
public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory) {
return wareHouseCategoryMapper.deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory);
}
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseInfoServiceImpl.java
View File

@ -82,7 +82,7 @@ public class WareHouseInfoServiceImpl implements WareHouseInfoService {
* @return 结果
*/
@Override
public int deleteWareHouseInfoByWareHouseId(Long WareHouseId) {
return wareHouseInfoMapper.deleteWareHouseInfoByWareHouseId(WareHouseId);
public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo) {
return wareHouseInfoMapper.deleteWareHouseInfoByWareHouseId(WareHouseInfo);
}
}

23
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml
View File

@ -39,12 +39,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSupermarketProductList" parameterType="com.bonus.canteen.core.supermarket.domain.SupermarketProduct" resultType="com.bonus.canteen.core.supermarket.domain.SupermarketProduct">
select sp.product_id as productId,sp.supermarket_id as supermarketid,sp.product_name as productname,sp.bar_code as barcode,sp.sale_price as saleprice,sp.sales_mode as salesmode,
sp.area_id as areaid,aa.area_name as areaname,sp.unit_id as unitid,sp.product_type as producttype,sp.pref_price as prefprice,sp.quality_type as qualitytype,sp.quality_num as qualitynum,
sp.supply_certificate as supplycertificate,sp.product_remark as productremark,sp.putaway_state as putawaystate,sp.if_online as ifonline,sp.person_limit as personlimit,sp.one_day_limit as onedaylimit,sp.img_url as imgurl,sp.inventory_num as inventorynum,sp.revision,sp.create_by as createby,sp.create_time as createtime,sp.update_by as updateby,sp.update_time as updatetime,sp.product_code as productcode
sp.supply_certificate as supplycertificate,sp.product_remark as productremark,sp.putaway_state as putawaystate,sp.if_online as ifonline,sp.person_limit as personlimit,
sp.one_day_limit as onedaylimit,sp.img_url as imgurl,sp.inventory_num as inventorynum,sp.revision,sp.create_by as createby,sp.create_time as createtime,sp.update_by as updateby,
sp.update_time as updatetime,sp.product_code as productcode,sp.state
from supermarket_product sp
left join alloc_area aa on sp.area_id=aa.area_id
<where>
<if test="productType != null and productType != ''"> and sp.product_type = #{productType}</if>
<if test="areaId != null and areaId != ''"> and sp.area_id = #{areaId}</if>
<if test="supermarketId != null and supermarketId != ''"> and sp.supermarket_id = #{supermarketId}</if>
<if test="productName != null and productName != ''"> and sp.product_name like concat('%', #{productName}, '%')</if>
<if test="barCode != null and barCode != ''"> and sp.bar_code like concat('%', #{barCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and sp.product_code like concat('%', #{productCode}, '%')</if>
</where>
</select>
<select id="selectNoSupermarketProductList" parameterType="com.bonus.canteen.core.supermarket.domain.SupermarketProduct" resultType="com.bonus.canteen.core.supermarket.domain.SupermarketProduct">
select sp.product_id as productId,sp.supermarket_id as supermarketid,sp.product_name as productname,sp.bar_code as barcode,sp.sale_price as saleprice,sp.sales_mode as salesmode,
sp.area_id as areaid,aa.area_name as areaname,sp.unit_id as unitid,sp.product_type as producttype,sp.pref_price as prefprice,sp.quality_type as qualitytype,sp.quality_num as qualitynum,
sp.supply_certificate as supplycertificate,sp.product_remark as productremark,sp.putaway_state as putawaystate,sp.if_online as ifonline,sp.person_limit as personlimit,
sp.one_day_limit as onedaylimit,sp.img_url as imgurl,sp.inventory_num as inventorynum,sp.revision,sp.create_by as createby,sp.create_time as createtime,sp.update_by as updateby,
sp.update_time as updatetime,sp.product_code as productcode,sp.state
from supermarket_product sp
left join alloc_area aa on sp.area_id=aa.area_id
<where>
<if test="productType != null and productType != ''"> and sp.product_type = #{productType}</if>
<if test="areaId != null and areaId != ''"> and sp.area_id = #{areaId}</if>
<if test="supermarketId != null and supermarketId != ''"> and sp.supermarket_id != #{supermarketId}</if>
<if test="productName != null and productName != ''"> and sp.product_name like concat('%', #{productName}, '%')</if>
<if test="barCode != null and barCode != ''"> and sp.bar_code like concat('%', #{barCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and sp.product_code like concat('%', #{productCode}, '%')</if>

59
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseCategoryMapper.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.warehouse.mapper.WareHouseCategoryMapper">
<select id="selectWareHouseCategoryList" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseCategory" resultType="com.bonus.canteen.core.warehouse.domain.WareHouseCategory">
select wc.category_id as categoryid,wc.category_name as categoryname,wc.create_time as createtime,
wc.update_time as updatetime,wc.area_id as areaid,aa.area_name as areaname
from warehouse_category wc
left join alloc_area aa on wc.area_id=aa.area_id
<where>
<if test="areaId != null and areaId != ''"> and wc.area_id = #{areaId}</if>
<if test="categoryName != null and categoryName != ''"> and wh.category_name like concat('%', #{categoryName}, '%')</if>
</where>
</select>
<insert id="insertWareHouseCategory" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseCategory">
insert into warehouse_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="areaId !=null" >area_id , </if>
<if test="categoryName !=null" >category_name , </if>
<if test="createBy !=null" >create_by , </if>
<if test="createTime !=null" >create_time , </if>
<if test="updateBy !=null" >update_by , </if>
<if test="updateTime !=null" >update_time , </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="areaId !=null" >#{areaId },</if>
<if test="categoryName !=null" >#{categoryName },</if>
<if test="createBy !=null" >#{createBy },</if>
<if test="createTime !=null" >#{createTime },</if>
<if test="updateBy !=null" >#{updateBy },</if>
<if test="updateTime !=null" >#{updateTime },</if>
</trim>
</insert>
<update id="updateWareHouseCategory" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseCategory">
update warehouse_category
<trim prefix="SET" suffixOverrides=",">
<if test="areaId !=null" >area_id =#{areaId },</if>
<if test="categoryName !=null" >category_name =#{categoryName },</if>
<if test="updateBy !=null" >update_by =#{updateBy },</if>
<if test="updateTime !=null" >update_time =#{updateTime },</if>
</trim>
where category_id = #{categoryId}
</update>
<delete id="deleteWareHouseCategoryByWareHouseCategoryId" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseCategory">
delete from warehouse_category where category_id = #{categoryId}
</delete>
<delete id="deleteWareHouseCategoryByWareHouseIds" parameterType="String">
delete from warehouse_category where category_id in
<foreach item="categoryId" collection="array" open="(" separator="," close=")">
#{categoryId}
</foreach>
</delete>
</mapper>

142
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseInfoMapper.xml
View File

@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseType" column="warehouse_type" />
<result property="status" column="status" />
<result property="delFlag" column="del_flag" />
<result property="typeId" column="type_id" />
<result property="categoryId" column="category_id" />
<result property="areaId" column="area_id" />
<result property="revision" column="revision" />
<result property="createBy" column="create_by" />
@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWareHouseInfoVo">
select warehouse_id,warehouse_num,warehouse_name,user_id,region_province,region_city,region_district,address,warehouse_type,status,del_flag,type_id,area_id,revision,create_by,create_time,update_by,update_time,if_use_warehouse_area,if_use_warehouse_location,parent_id,canteen_id,fetch_user_id from warehouse_info
select warehouse_id,warehouse_num,warehouse_name,user_id,region_province,region_city,region_district,address,warehouse_type,status,del_flag,category_id,area_id,revision,create_by,create_time,update_by,update_time,if_use_warehouse_area,if_use_warehouse_location,parent_id,canteen_id,fetch_user_id from warehouse_info
</sql>
<select id="selectWareHouseInfoList" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseInfo" resultType="com.bonus.canteen.core.warehouse.domain.WareHouseInfo">
select wh.warehouse_id as warehouseid,wh.warehouse_num as warehousenum,wh.warehouse_name as warehousename,wh.user_id as userid,wh.region_province as regionprovince,
wh.region_city as regioncity,wh.region_district as regiondistrict,wh.address,wh.warehouse_type as warehousetype,wh.status,wh.del_flag as delflag,
wh.type_id as typeid,wh.area_id as areaid,aa.area_name as areaname,wh.revision,wh.create_by as createby,wh.create_time as createtime,wh.update_by as updateby,wh.update_time as updatetime,
wh.category_id as typeid,wh.area_id as areaid,aa.area_name as areaname,wh.revision,wh.create_by as createby,wh.create_time as createtime,wh.update_by as updateby,wh.update_time as updatetime,
wh.if_use_warehouse_area as ifusewarehousearea,wh.if_use_warehouse_location as ifusewarehouselocation
,wh.parent_id as parentid,wh.canteen_id as canteenid,ac.canteen_name as canteenname,wh.fetch_user_id,su.user_name as username
from warehouse_info wh
@ -53,86 +53,86 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertWareHouseInfo" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseInfo">
insert into warehouse_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehouseNum !=null" >warehouse_num , </if>
<if test="warehouseName !=null" >warehouse_name , </if>
<if test="userId !=null" >user_id , </if>
<if test="userType !=null" >user_type , </if>
<if test="regionProvince !=null" >region_province , </if>
<if test="regionCity !=null" >region_city , </if>
<if test="regionDistrict !=null" >region_district , </if>
<if test="address !=null" >address , </if>
<if test="warehouseType !=null" >warehouse_type , </if>
<if test="status !=null" >status , </if>
<if test="delFlag !=null" >del_flag , </if>
<if test="typeId !=null" >type_id , </if>
<if test="areaId !=null" >area_id , </if>
<if test="revision !=null" >revision , </if>
<if test="createBy !=null" >create_by , </if>
<if test="createTime !=null" >create_time , </if>
<if test="updateBy !=null" >update_by , </if>
<if test="updateTime !=null" >update_time , </if>
<if test="ifUseWarehouseArea !=null" >if_use_warehouse_area , </if>
<if test="ifUseWarehouseLocation!=null" >if_use_warehouse_location, </if>
<if test="parentId !=null" >parent_id , </if>
<if test="canteenId !=null" >canteen_id , </if>
<if test="fetchUserId !=null" >fetch_user_id , </if>
<if test="warehouseNum !=null" >warehouse_num , </if>
<if test="warehouseName !=null" >warehouse_name , </if>
<if test="userId !=null" >user_id , </if>
<if test="userType !=null" >user_type , </if>
<if test="regionProvince !=null" >region_province , </if>
<if test="regionCity !=null" >region_city , </if>
<if test="regionDistrict !=null" >region_district , </if>
<if test="address !=null" >address , </if>
<if test="warehouseType !=null" >warehouse_type , </if>
<if test="status !=null" >status , </if>
<if test="delFlag !=null" >del_flag , </if>
<if test="categoryId !=null" >category_id , </if>
<if test="areaId !=null" >area_id , </if>
<if test="revision !=null" >revision , </if>
<if test="createBy !=null" >create_by , </if>
<if test="createTime !=null" >create_time , </if>
<if test="updateBy !=null" >update_by , </if>
<if test="updateTime !=null" >update_time , </if>
<if test="ifUseWarehouseArea !=null" >if_use_warehouse_area , </if>
<if test="ifUseWarehouseLocation!=null" >if_use_warehouse_location , </if>
<if test="parentId !=null" >parent_id , </if>
<if test="canteenId !=null" >canteen_id , </if>
<if test="fetchUserId !=null" >fetch_user_id , </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehouseNum !=null" >#{warehouseNum },</if>
<if test="warehouseName !=null" >#{warehouseName },</if>
<if test="userId !=null" >#{userId },</if>
<if test="userType !=null" >#{userType },</if>
<if test="regionProvince !=null" >#{regionProvince },</if>
<if test="regionCity !=null" >#{regionCity },</if>
<if test="regionDistrict !=null" >#{regionDistrict },</if>
<if test="address !=null" >#{address },</if>
<if test="warehouseType !=null" >#{warehouseType },</if>
<if test="status !=null" >#{status },</if>
<if test="delFlag !=null" >#{delFlag },</if>
<if test="typeId !=null" >#{typeId },</if>
<if test="areaId !=null" >#{areaId },</if>
<if test="revision !=null" >#{revision },</if>
<if test="createBy !=null" >#{createBy },</if>
<if test="createTime !=null" >#{createTime },</if>
<if test="updateBy !=null" >#{updateBy },</if>
<if test="updateTime !=null" >#{updateTime },</if>
<if test="ifUseWarehouseArea !=null" >#{ifUseWarehouseArea },</if>
<if test="ifUseWarehouseLocation!=null" >#{ifUseWarehouseLocation},</if>
<if test="parentId !=null" >#{parentId },</if>
<if test="canteenId !=null" >#{canteenId },</if>
<if test="fetchUserId !=null" >#{fetchUserId },</if>
<if test="warehouseNum !=null" >#{warehouseNum },</if>
<if test="warehouseName !=null" >#{warehouseName },</if>
<if test="userId !=null" >#{userId },</if>
<if test="userType !=null" >#{userType },</if>
<if test="regionProvince !=null" >#{regionProvince },</if>
<if test="regionCity !=null" >#{regionCity },</if>
<if test="regionDistrict !=null" >#{regionDistrict },</if>
<if test="address !=null" >#{address },</if>
<if test="warehouseType !=null" >#{warehouseType },</if>
<if test="status !=null" >#{status },</if>
<if test="delFlag !=null" >#{delFlag },</if>
<if test="typeId !=null" >#{typeId },</if>
<if test="areaId !=null" >#{areaId },</if>
<if test="revision !=null" >#{revision },</if>
<if test="createBy !=null" >#{createBy },</if>
<if test="createTime !=null" >#{createTime },</if>
<if test="updateBy !=null" >#{updateBy },</if>
<if test="updateTime !=null" >#{updateTime },</if>
<if test="ifUseWarehouseArea !=null" >#{ifUseWarehouseArea },</if>
<if test="ifUseWarehouseLocation!=null" >#{ifUseWarehouseLocation },</if>
<if test="parentId !=null" >#{parentId },</if>
<if test="canteenId !=null" >#{canteenId },</if>
<if test="fetchUserId !=null" >#{fetchUserId },</if>
</trim>
</insert>
<update id="updateWareHouseInfo" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseInfo">
update warehouse_info
<trim prefix="SET" suffixOverrides=",">
<if test="warehouseNum !=null" >warehouse_num =#{warehouseNum },</if>
<if test="warehouseName !=null" >warehouse_name =#{warehouseName },</if>
<if test="userId !=null" >user_id =#{userId },</if>
<if test="userType !=null" >user_type =#{userType },</if>
<if test="regionProvince !=null" >region_province =#{regionProvince },</if>
<if test="regionCity !=null" >region_city =#{regionCity },</if>
<if test="regionDistrict !=null" >region_district =#{regionDistrict },</if>
<if test="address !=null" >address =#{address },</if>
<if test="warehouseType !=null" >warehouse_type =#{warehouseType },</if>
<if test="status !=null" >status =#{status },</if>
<if test="delFlag !=null" >del_flag =#{delFlag },</if>
<if test="typeId !=null" >type_id =#{typeId },</if>
<if test="areaId !=null" >area_id =#{areaId },</if>
<if test="revision !=null" >revision =#{revision },</if>
<if test="updateBy !=null" >create_by =#{updateBy },</if>
<if test="updateTime !=null" >create_time =#{updateTime },</if>
<if test="ifUseWarehouseArea !=null" >update_by =#{ifUseWarehouseArea },</if>
<if test="ifUseWarehouseLocation!=null" >update_time =#{ifUseWarehouseLocation },</if>
<if test="parentId !=null" >if_use_warehouse_area =#{parentId },</if>
<if test="canteenId !=null" >if_use_warehouse_location=#{canteenId },</if>
<if test="fetchUserId !=null" >parent_id =#{fetchUserId },</if>
<if test="warehouseNum !=null" >warehouse_num =#{warehouseNum },</if>
<if test="warehouseName !=null" >warehouse_name =#{warehouseName },</if>
<if test="userId !=null" >user_id =#{userId },</if>
<if test="userType !=null" >user_type =#{userType },</if>
<if test="regionProvince !=null" >region_province =#{regionProvince },</if>
<if test="regionCity !=null" >region_city =#{regionCity },</if>
<if test="regionDistrict !=null" >region_district =#{regionDistrict },</if>
<if test="address !=null" >address =#{address },</if>
<if test="warehouseType !=null" >warehouse_type =#{warehouseType },</if>
<if test="status !=null" >status =#{status },</if>
<if test="delFlag !=null" >del_flag =#{delFlag },</if>
<if test="categoryId !=null" >category_id =#{categoryId },</if>
<if test="areaId !=null" >area_id =#{areaId },</if>
<if test="revision !=null" >revision =#{revision },</if>
<if test="updateBy !=null" >update_by =#{updateBy },</if>
<if test="updateTime !=null" >update_time =#{updateTime },</if>
<if test="ifUseWarehouseArea !=null" >if_use_warehouse_area =#{ifUseWarehouseArea },</if>
<if test="ifUseWarehouseLocation!=null" >if_use_warehouse_location =#{ifUseWarehouseLocation },</if>
<if test="parentId !=null" >parent_id =#{parentId },</if>
<if test="canteenId !=null" >canteen_id =#{canteenId },</if>
<if test="fetchUserId !=null" >fetch_user_id =#{fetchUserId },</if>
</trim>
where warehouse_id = #{warehouseId}
</update>
<delete id="deleteWareHouseInfoByWareHouseId" parameterType="Long">
<delete id="deleteWareHouseInfoByWareHouseId" parameterType="com.bonus.canteen.core.warehouse.domain.WareHouseInfo">
delete from warehouse_info where warehouse_id = #{warehouseId}
</delete>