diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js index d83760bde..98abf5ba4 100644 --- a/fuintAdmin_zt/src/api/allOrder.js +++ b/fuintAdmin_zt/src/api/allOrder.js @@ -9,6 +9,15 @@ export function getOrderListApi(query) { }) } + +export function getOrderListApis(query) { + return request({ + url: 'business/allOrderInfo/getPageLists', + method: 'get', + params: query + + }) +} // 分页查询所有的订单信息 export function getSumPayMoneyApi(query) { return request({ diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue index 793eeb64f..ed0362826 100644 --- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue +++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue @@ -13,51 +13,42 @@ /> - - - - - - - - - - + + + + + + + + + + + + + - + - + + + + + @@ -86,44 +77,23 @@ - - + - - + - - - - - - + @@ -140,9 +110,9 @@ - + @@ -165,7 +135,7 @@ import {getName} from "../../../utils/fuint"; import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff"; // import {getDuty, listDuty} from "@/api/staff/duty"; - import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder"; + import { getOrderListApis,getSumPayMoneyApi } from "../../../api/allOrder"; export default { name: "asdf", dicts: ['transaction','handover','handover_quit','payment_type','pay_status', @@ -251,7 +221,7 @@ getList() { this.loading = true; this.queryParams.storeId = this.id - getOrderListApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => { + getOrderListApis(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.list = response.data.records; this.total = response.data.total; this.getSumPayMoney() diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index 8f34f9c3b..66f08a88b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -47,6 +47,22 @@ public class AllOrderInfoController extends BaseController { IPage list = allOrderInfoService.getPageList(page, allOrderInfo); return getSuccessResult(list); } + /** + * 分页查询全部订单信息 + * @param allOrderInfo + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("getPageLists") + public ResponseObject getPageLists(AllOrderInfo allOrderInfo, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + IPage list = allOrderInfoService.getPageLists(page, allOrderInfo); + return getSuccessResult(list); + } + @GetMapping("/findOrderStatistics") public ResponseObject findOrderStatistics(AllOrderInfoRes allOrderInfoRes){ Map map = allOrderInfoService.findOrderStatistics(allOrderInfoRes); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index bb05f3b0b..656f0983e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -29,6 +29,7 @@ import java.util.Map; public interface AllOrderInfoMapper extends BaseMapper { IPage getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); + IPage getPageLists(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); Map findOrderStatistics(@Param("allOrderInfo") AllOrderInfoRes allOrderInfoRes,@Param("beginTime") String startTime, @Param("endTime") String endTime); List getAllOrderInfo(@Param("obj") AllOrderInfoRes allOrderInfoRes, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 7994b5eac..2a8cfcf28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -2019,4 +2019,87 @@ LEFT JOIN mt_goods mt on ig.goods_id=mt.id where ig.store_id=#{obj.storeId} + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java index c5dcdae35..aa267aae5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java @@ -30,6 +30,7 @@ public interface AllOrderInfoService { * @return */ IPage getPageList(Page page, AllOrderInfo allOrderInfo); + IPage getPageLists(Page page, AllOrderInfo allOrderInfo); Map findOrderStatistics(AllOrderInfoRes allOrderInfoRes); void exportExcelHandoverOrder(HttpServletResponse response, AllOrderInfoRes allOrderInfoRes); AllOrderInfoVo getOrderInfoById(Integer id); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index e41434d61..b76b282b6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -155,7 +155,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl pageList = allOrderInfoMapper.getPageList(page, allOrderInfo); return pageList; } - + @Override + public IPage getPageLists(Page page, AllOrderInfo allOrderInfo) { + IPage pageList = allOrderInfoMapper.getPageLists(page, allOrderInfo); + return pageList; + } @Override public Map findOrderStatistics(AllOrderInfoRes allOrderInfoRes) { String startTime = allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[0]; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java index 10b9c4e16..3be9a8fe5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java @@ -27,6 +27,7 @@ import com.fuint.business.sys.mapper.SysNotifyMapper; import com.fuint.business.sys.service.SysNotificationlogService; import com.fuint.business.sys.service.SysNotifyService; import com.fuint.common.service.AccountService; +import com.fuint.repository.mapper.MtStaffMapper; import com.fuint.repository.mapper.TAccountMapper; import com.fuint.repository.model.TAccount; import com.fuint.system.role.entity.TDuty; @@ -310,6 +311,8 @@ public class SysNotifyServiceImpl extends ServiceImpl diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index bbf81c53a..7719f0cb4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -975,8 +975,10 @@ public class LJUserServiceImpl extends ServiceImpl impleme if (pointsChange.getFromType().equals("营销赠送")){ marketingGivePoint += pointsChange.getPoints(); } - if (pointsChange.getFromType().equals("会员升级赠送")){ - upgradationPoint += pointsChange.getPoints(); + if (pointsChange.getFromType().equals("会员升级赠送") || pointsChange.getFromType().equals("新增会员") ){ + if(pointsChange.getPoints()!=null){ + upgradationPoint += pointsChange.getPoints(); + } } if (pointsChange.getFromType().equals("消费赠送")){ consumePoint += pointsChange.getPoints(); diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TAccountMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TAccountMapper.java index bee33bcc3..37f577548 100644 --- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TAccountMapper.java +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TAccountMapper.java @@ -30,4 +30,6 @@ public interface TAccountMapper extends BaseMapper { List getByRoleId(List roleIds); + + TAccount selectOnes(@Param("staffId") Integer staffId); } diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml index e27a05740..c9cba2a4f 100644 --- a/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml +++ b/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml @@ -114,4 +114,12 @@ + +