diff --git a/fuintAdmin/src/api/staff/user/creditunit.js b/fuintAdmin/src/api/staff/user/creditunit.js new file mode 100644 index 000000000..1bd48a133 --- /dev/null +++ b/fuintAdmin/src/api/staff/user/creditunit.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询挂账信息列表 +export function listCreditUnit(query) { + return request({ + url: '/business/creditUnit/list', + method: 'get', + params: query + }) +} + +// 查询挂账信息列表 +export function listsCreditUnit(query) { + return request({ + url: '/business/creditUnit/queryList', + method: 'get', + params: query + }) +} + +// 新增挂账记录 +export function addCreditUnit(data) { + return request({ + url: '/business/creditUnit', + method: 'post', + data: data + }) +} diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue index 2b53dbbf7..f738a3cbe 100644 --- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue +++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue @@ -632,6 +632,7 @@ export default { if (recovery==1){ name = "确定要将此商品移至回收站吗?移出后将无法售卖当前商品！" prompt = "商品已移至回收站,收银台商品信息页面刷新后实时生效！" + form.status = 'jy' }else { name = "确定要将此商品从回收站移至商品档案里吗?移出后将可售卖当前商品！" prompt = "商品已移至商品档案,收银台商品信息页面刷新后实时生效！" diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue index 6547274dd..ca64a0bcc 100644 --- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue +++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue @@ -101,7 +101,7 @@ {{ getName(supplierList, scope.row.supplierId) }} - + @@ -116,8 +116,8 @@ @@ -288,6 +288,15 @@ export default { this.getTree(); }, methods: { + getName(list,id){ + let name = "" + list.forEach(item => { + if (item.id==id){ + name = item.name; + } + }) + return name; + }, // 获取分类菜单 getTree(){ cvsGoodsTree().then(response => { diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue new file mode 100644 index 000000000..393f04623 --- /dev/null +++ b/fuintAdmin/src/views/member/creditIndex.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java index 90ec94daa..c9c39f93c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java @@ -1,5 +1,6 @@ package com.fuint.business.order.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.CreditUnit; import com.fuint.business.order.service.CreditUnitService; import com.fuint.framework.web.BaseController; @@ -14,6 +15,18 @@ public class CreditUnitController extends BaseController { @Autowired private CreditUnitService creditUnitService; + /** + * 查询所有挂账单位信息 + * @return + */ + @GetMapping("/queryList") + private ResponseObject queryList(CreditUnit creditUnit, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + return getSuccessResult(creditUnitService.selectCreditUnitList(page,creditUnit)); + } + /** * 查询所有挂账单位信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java index 07d612346..fc85668df 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java @@ -53,6 +53,14 @@ public class CreditUnit extends BaseEntity implements Serializable { * 挂账额度 */ private Double creditLimit; + /** + * 挂账额度 + */ + private Double usedCreditLimit; + /** + * 挂账额度 + */ + private Double residueCreditLimit; /** * 单据备注 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java index 1d39b3b01..135dc366f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java @@ -1,10 +1,20 @@ package com.fuint.business.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.CreditUnit; +import org.apache.ibatis.annotations.Param; /** * 挂账单位信息 mapper层 */ public interface CreditUnitMapper extends BaseMapper { + /** + * 根据条件分页查询挂账单位信息 + * @param page + * @param creditUnit + * @return + */ + public IPage selectCreditUnitList(Page page,@Param("creditUnit") CreditUnit creditUnit); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml new file mode 100644 index 000000000..e9a64d4de --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java index 9a9857417..49df45d53 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java @@ -1,5 +1,7 @@ package com.fuint.business.order.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.order.entity.CreditUnit; import org.springframework.transaction.annotation.Transactional; @@ -11,6 +13,14 @@ import java.util.List; */ @Transactional public interface CreditUnitService extends IService { + /** + * 根据条件分页查询挂账单位信息 + * @param page + * @param creditUnit + * @return + */ + public IPage selectCreditUnitList(Page page, CreditUnit creditUnit); + /** * 查询所有挂账单位信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java index 0c2f4b187..421d75243 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java @@ -1,6 +1,8 @@ package com.fuint.business.order.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.order.entity.CreditUnit; import com.fuint.business.order.mapper.CreditUnitMapper; @@ -18,13 +20,20 @@ import java.util.List; public class CreditUnitServiceImpl extends ServiceImpl implements CreditUnitService { @Autowired private ILJStoreService storeService; + + @Override + public IPage selectCreditUnitList(Page page, CreditUnit creditUnit) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + creditUnit.setStoreId(nowAccountInfo.getStoreId()); + return baseMapper.selectCreditUnitList(page,creditUnit); + } + @Override public List selectCreditUnitList() { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status","qy"); - queryWrapper.eq("chain_store_id",store.getChainStoreId()); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); List list = baseMapper.selectList(queryWrapper); return list; }