1
0

2 Коммиты 0a139e0351 ... 19fbc5b6b9

Автор SHA1 Сообщение Дата
  dail 19fbc5b6b9 Merge branch 'dail-dev' into dev 2 лет назад
  dail fa89aa7452 实体类初始化 2 лет назад
37 измененных файлов с 1743 добавлено и 79 удалено
  1. 79 79
      Source/group-platform/admin/src/main/java/com/younike/admin/controller/appUserManage/AppUserController.java
  2. 88 0
      Source/group-platform/admin/src/main/java/com/younike/member/controller/AppMemberVlogAttachController.java
  3. 88 0
      Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderController.java
  4. 88 0
      Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderGoodsController.java
  5. 88 0
      Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderGpDetailController.java
  6. 88 0
      Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderRedeemLogController.java
  7. 88 0
      Source/group-platform/admin/src/main/java/com/younike/store/controller/AppUserController.java
  8. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/AppMemberVlogAttachMapper.java
  9. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/AppUserMapper.java
  10. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderGoodsMapper.java
  11. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderGpDetailMapper.java
  12. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderMapper.java
  13. 14 0
      Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderRedeemLogMapper.java
  14. 56 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/AppMemberVlogAttach.java
  15. 78 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/AppUser.java
  16. 105 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/Order.java
  17. 93 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderGoods.java
  18. 73 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderGpDetail.java
  19. 66 0
      Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderRedeemLog.java
  20. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IAppMemberVlogAttachService.java
  21. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IAppUserService.java
  22. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IOrderGoodsService.java
  23. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IOrderGpDetailService.java
  24. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IOrderRedeemLogService.java
  25. 22 0
      Source/group-platform/service/src/main/java/com/younike/service/service/IOrderService.java
  26. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/AppMemberVlogAttachServiceImpl.java
  27. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/AppUserServiceImpl.java
  28. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderGoodsServiceImpl.java
  29. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderGpDetailServiceImpl.java
  30. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderRedeemLogServiceImpl.java
  31. 39 0
      Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderServiceImpl.java
  32. 29 0
      Source/group-platform/service/src/main/resources/mapper/system/AppMemberVlogAttachMapper.xml
  33. 36 0
      Source/group-platform/service/src/main/resources/mapper/system/AppUserMapper.xml
  34. 40 0
      Source/group-platform/service/src/main/resources/mapper/system/OrderGoodsMapper.xml
  35. 34 0
      Source/group-platform/service/src/main/resources/mapper/system/OrderGpDetailMapper.xml
  36. 44 0
      Source/group-platform/service/src/main/resources/mapper/system/OrderMapper.xml
  37. 32 0
      Source/group-platform/service/src/main/resources/mapper/system/OrderRedeemLogMapper.xml

+ 79 - 79
Source/group-platform/admin/src/main/java/com/younike/admin/controller/appUserManage/AppUserController.java

@@ -1,79 +1,79 @@
-package com.younike.admin.controller.appUserManage;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.younike.common.annotation.OpLog;
-import com.younike.common.bean.APIResult;
-import com.younike.common.bean.ResultGenerator;
-import com.younike.common.constant.BusinessType;
-import com.younike.common.core.controller.BaseController;
-import com.younike.common.core.page.PageParam;
-import com.younike.service.pojo.TAppUser;
-import com.younike.service.service.ITAppUserService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * app用户管理Controller
- *
- * @author jiay
- * @date 2022-03-22
- */
-@RestController
-@RequestMapping("/appUser")
-public class AppUserController extends BaseController {
-    @Autowired
-    private ITAppUserService tAppUserService;
-
-    /**
-     * 查询app用户列表
-     */
-    @RequiresPermissions("appUser:list")
-    @PostMapping("/list")
-    public Page list(@RequestBody PageParam<TAppUser> page) {
-
-        return tAppUserService.page(page);
-    }
-
-
-    /**
-     * 获取app用户详细信息
-     */
-    @RequiresPermissions("appUser:query")
-    @GetMapping(value = "/{id}")
-    public APIResult getInfo(@PathVariable("id") String id) {
-        return ResultGenerator.getSuccessResult(tAppUserService.getById(id));
-    }
-
-    /**
-     * 新增app用户
-     */
-    @RequiresPermissions("appUser:add")
-    @OpLog(title = "app用户", type = BusinessType.INSERT)
-    @PostMapping
-    public APIResult add(@RequestBody TAppUser tAppUser) {
-        return ResultGenerator.getSuccessResult(tAppUserService.save(tAppUser));
-    }
-
-    /**
-     * 修改app用户
-     */
-    @RequiresPermissions("appUser:edit")
-    @OpLog(title = "app用户", type = BusinessType.UPDATE)
-    @PutMapping
-    public APIResult edit(@RequestBody TAppUser tAppUser) {
-        return ResultGenerator.getSuccessResult(tAppUserService.updateById(tAppUser));
-    }
-
-    /**
-     * 删除app用户
-     */
-    @RequiresPermissions("appUser:remove")
-    @OpLog(title = "app用户", type = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public APIResult remove(@PathVariable List<String> ids) {
-        return ResultGenerator.getSuccessResult(tAppUserService.removeByIds(ids));
-    }
-}
+//package com.younike.admin.controller.appUserManage;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.younike.common.annotation.OpLog;
+//import com.younike.common.bean.APIResult;
+//import com.younike.common.bean.ResultGenerator;
+//import com.younike.common.constant.BusinessType;
+//import com.younike.common.core.controller.BaseController;
+//import com.younike.common.core.page.PageParam;
+//import com.younike.service.pojo.TAppUser;
+//import com.younike.service.service.ITAppUserService;
+//import org.apache.shiro.authz.annotation.RequiresPermissions;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * app用户管理Controller
+// *
+// * @author jiay
+// * @date 2022-03-22
+// */
+//@RestController
+//@RequestMapping("/appUser")
+//public class AppUserController extends BaseController {
+//    @Autowired
+//    private ITAppUserService tAppUserService;
+//
+//    /**
+//     * 查询app用户列表
+//     */
+//    @RequiresPermissions("appUser:list")
+//    @PostMapping("/list")
+//    public Page list(@RequestBody PageParam<TAppUser> page) {
+//
+//        return tAppUserService.page(page);
+//    }
+//
+//
+//    /**
+//     * 获取app用户详细信息
+//     */
+//    @RequiresPermissions("appUser:query")
+//    @GetMapping(value = "/{id}")
+//    public APIResult getInfo(@PathVariable("id") String id) {
+//        return ResultGenerator.getSuccessResult(tAppUserService.getById(id));
+//    }
+//
+//    /**
+//     * 新增app用户
+//     */
+//    @RequiresPermissions("appUser:add")
+//    @OpLog(title = "app用户", type = BusinessType.INSERT)
+//    @PostMapping
+//    public APIResult add(@RequestBody TAppUser tAppUser) {
+//        return ResultGenerator.getSuccessResult(tAppUserService.save(tAppUser));
+//    }
+//
+//    /**
+//     * 修改app用户
+//     */
+//    @RequiresPermissions("appUser:edit")
+//    @OpLog(title = "app用户", type = BusinessType.UPDATE)
+//    @PutMapping
+//    public APIResult edit(@RequestBody TAppUser tAppUser) {
+//        return ResultGenerator.getSuccessResult(tAppUserService.updateById(tAppUser));
+//    }
+//
+//    /**
+//     * 删除app用户
+//     */
+//    @RequiresPermissions("appUser:remove")
+//    @OpLog(title = "app用户", type = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public APIResult remove(@PathVariable List<String> ids) {
+//        return ResultGenerator.getSuccessResult(tAppUserService.removeByIds(ids));
+//    }
+//}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/member/controller/AppMemberVlogAttachController.java

@@ -0,0 +1,88 @@
+package com.younike.member.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.AppMemberVlogAttach;
+import com.younike.service.service.IAppMemberVlogAttachService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 会员日记附件信息Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/appMemberVlogAttach")
+public class AppMemberVlogAttachController extends BaseController {
+    @Autowired
+    private IAppMemberVlogAttachService appMemberVlogAttachService;
+
+    /**
+     * 查询会员日记附件信息列表
+     */
+    @RequiresPermissions("attach:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<AppMemberVlogAttach> page) {
+
+        return appMemberVlogAttachService.page(page);
+    }
+
+
+    /**
+     * 获取会员日记附件信息详细信息
+     */
+    @RequiresPermissions("attach:query")
+    @GetMapping(value = "/{memberVlogAttachId}")
+    public APIResult getInfo(@PathVariable("memberVlogAttachId") String memberVlogAttachId) {
+        return ResultGenerator.getSuccessResult(appMemberVlogAttachService.getById(memberVlogAttachId));
+    }
+
+    /**
+     * 新增会员日记附件信息
+     */
+    @RequiresPermissions("attach:add")
+    @OpLog(title = "会员日记附件信息", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody AppMemberVlogAttach appMemberVlogAttach) {
+        return ResultGenerator.getSuccessResult(appMemberVlogAttachService.save(appMemberVlogAttach));
+    }
+
+    /**
+     * 修改会员日记附件信息
+     */
+    @RequiresPermissions("attach:edit")
+    @OpLog(title = "会员日记附件信息", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody AppMemberVlogAttach appMemberVlogAttach) {
+        return ResultGenerator.getSuccessResult(appMemberVlogAttachService.updateById(appMemberVlogAttach));
+    }
+
+    /**
+     * 删除会员日记附件信息
+     */
+    @RequiresPermissions("attach:remove")
+    @OpLog(title = "会员日记附件信息", type = BusinessType.DELETE)
+    @DeleteMapping("/{memberVlogAttachIds}")
+    public APIResult remove(@PathVariable List<String> memberVlogAttachIds) {
+        return ResultGenerator.getSuccessResult(appMemberVlogAttachService.removeByIds(memberVlogAttachIds));
+    }
+}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderController.java

@@ -0,0 +1,88 @@
+package com.younike.member.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.Order;
+import com.younike.service.service.IOrderService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 订单Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/order")
+public class OrderController extends BaseController {
+    @Autowired
+    private IOrderService orderService;
+
+    /**
+     * 查询订单列表
+     */
+    @RequiresPermissions("order:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<Order> page) {
+
+        return orderService.page(page);
+    }
+
+
+    /**
+     * 获取订单详细信息
+     */
+    @RequiresPermissions("order:query")
+    @GetMapping(value = "/{orderId}")
+    public APIResult getInfo(@PathVariable("orderId") String orderId) {
+        return ResultGenerator.getSuccessResult(orderService.getById(orderId));
+    }
+
+    /**
+     * 新增订单
+     */
+    @RequiresPermissions("order:add")
+    @OpLog(title = "订单", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody Order order) {
+        return ResultGenerator.getSuccessResult(orderService.save(order));
+    }
+
+    /**
+     * 修改订单
+     */
+    @RequiresPermissions("order:edit")
+    @OpLog(title = "订单", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody Order order) {
+        return ResultGenerator.getSuccessResult(orderService.updateById(order));
+    }
+
+    /**
+     * 删除订单
+     */
+    @RequiresPermissions("order:remove")
+    @OpLog(title = "订单", type = BusinessType.DELETE)
+    @DeleteMapping("/{orderIds}")
+    public APIResult remove(@PathVariable List<String> orderIds) {
+        return ResultGenerator.getSuccessResult(orderService.removeByIds(orderIds));
+    }
+}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderGoodsController.java

@@ -0,0 +1,88 @@
+package com.younike.member.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.OrderGoods;
+import com.younike.service.service.IOrderGoodsService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 订单明细Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/orderGoods")
+public class OrderGoodsController extends BaseController {
+    @Autowired
+    private IOrderGoodsService orderGoodsService;
+
+    /**
+     * 查询订单明细列表
+     */
+    @RequiresPermissions("goods:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<OrderGoods> page) {
+
+        return orderGoodsService.page(page);
+    }
+
+
+    /**
+     * 获取订单明细详细信息
+     */
+    @RequiresPermissions("goods:query")
+    @GetMapping(value = "/{orderGoodsId}")
+    public APIResult getInfo(@PathVariable("orderGoodsId") String orderGoodsId) {
+        return ResultGenerator.getSuccessResult(orderGoodsService.getById(orderGoodsId));
+    }
+
+    /**
+     * 新增订单明细
+     */
+    @RequiresPermissions("goods:add")
+    @OpLog(title = "订单明细", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody OrderGoods orderGoods) {
+        return ResultGenerator.getSuccessResult(orderGoodsService.save(orderGoods));
+    }
+
+    /**
+     * 修改订单明细
+     */
+    @RequiresPermissions("goods:edit")
+    @OpLog(title = "订单明细", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody OrderGoods orderGoods) {
+        return ResultGenerator.getSuccessResult(orderGoodsService.updateById(orderGoods));
+    }
+
+    /**
+     * 删除订单明细
+     */
+    @RequiresPermissions("goods:remove")
+    @OpLog(title = "订单明细", type = BusinessType.DELETE)
+    @DeleteMapping("/{orderGoodsIds}")
+    public APIResult remove(@PathVariable List<String> orderGoodsIds) {
+        return ResultGenerator.getSuccessResult(orderGoodsService.removeByIds(orderGoodsIds));
+    }
+}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderGpDetailController.java

@@ -0,0 +1,88 @@
+package com.younike.member.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.OrderGpDetail;
+import com.younike.service.service.IOrderGpDetailService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 门店订单团购套餐内容商品信息Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/orderGpDetail")
+public class OrderGpDetailController extends BaseController {
+    @Autowired
+    private IOrderGpDetailService orderGpDetailService;
+
+    /**
+     * 查询门店订单团购套餐内容商品信息列表
+     */
+    @RequiresPermissions("detail:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<OrderGpDetail> page) {
+
+        return orderGpDetailService.page(page);
+    }
+
+
+    /**
+     * 获取门店订单团购套餐内容商品信息详细信息
+     */
+    @RequiresPermissions("detail:query")
+    @GetMapping(value = "/{orderGpDetailId}")
+    public APIResult getInfo(@PathVariable("orderGpDetailId") String orderGpDetailId) {
+        return ResultGenerator.getSuccessResult(orderGpDetailService.getById(orderGpDetailId));
+    }
+
+    /**
+     * 新增门店订单团购套餐内容商品信息
+     */
+    @RequiresPermissions("detail:add")
+    @OpLog(title = "门店订单团购套餐内容商品信息", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody OrderGpDetail orderGpDetail) {
+        return ResultGenerator.getSuccessResult(orderGpDetailService.save(orderGpDetail));
+    }
+
+    /**
+     * 修改门店订单团购套餐内容商品信息
+     */
+    @RequiresPermissions("detail:edit")
+    @OpLog(title = "门店订单团购套餐内容商品信息", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody OrderGpDetail orderGpDetail) {
+        return ResultGenerator.getSuccessResult(orderGpDetailService.updateById(orderGpDetail));
+    }
+
+    /**
+     * 删除门店订单团购套餐内容商品信息
+     */
+    @RequiresPermissions("detail:remove")
+    @OpLog(title = "门店订单团购套餐内容商品信息", type = BusinessType.DELETE)
+    @DeleteMapping("/{orderGpDetailIds}")
+    public APIResult remove(@PathVariable List<String> orderGpDetailIds) {
+        return ResultGenerator.getSuccessResult(orderGpDetailService.removeByIds(orderGpDetailIds));
+    }
+}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/member/controller/OrderRedeemLogController.java

@@ -0,0 +1,88 @@
+package com.younike.member.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.OrderRedeemLog;
+import com.younike.service.service.IOrderRedeemLogService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 门店订单核销记录(订单与核销码一对多)Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/orderRedeemLog")
+public class OrderRedeemLogController extends BaseController {
+    @Autowired
+    private IOrderRedeemLogService orderRedeemLogService;
+
+    /**
+     * 查询门店订单核销记录(订单与核销码一对多)列表
+     */
+    @RequiresPermissions("log:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<OrderRedeemLog> page) {
+
+        return orderRedeemLogService.page(page);
+    }
+
+
+    /**
+     * 获取门店订单核销记录(订单与核销码一对多)详细信息
+     */
+    @RequiresPermissions("log:query")
+    @GetMapping(value = "/{orderRedeemLogId}")
+    public APIResult getInfo(@PathVariable("orderRedeemLogId") String orderRedeemLogId) {
+        return ResultGenerator.getSuccessResult(orderRedeemLogService.getById(orderRedeemLogId));
+    }
+
+    /**
+     * 新增门店订单核销记录(订单与核销码一对多)
+     */
+    @RequiresPermissions("log:add")
+    @OpLog(title = "门店订单核销记录(订单与核销码一对多)", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody OrderRedeemLog orderRedeemLog) {
+        return ResultGenerator.getSuccessResult(orderRedeemLogService.save(orderRedeemLog));
+    }
+
+    /**
+     * 修改门店订单核销记录(订单与核销码一对多)
+     */
+    @RequiresPermissions("log:edit")
+    @OpLog(title = "门店订单核销记录(订单与核销码一对多)", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody OrderRedeemLog orderRedeemLog) {
+        return ResultGenerator.getSuccessResult(orderRedeemLogService.updateById(orderRedeemLog));
+    }
+
+    /**
+     * 删除门店订单核销记录(订单与核销码一对多)
+     */
+    @RequiresPermissions("log:remove")
+    @OpLog(title = "门店订单核销记录(订单与核销码一对多)", type = BusinessType.DELETE)
+    @DeleteMapping("/{orderRedeemLogIds}")
+    public APIResult remove(@PathVariable List<String> orderRedeemLogIds) {
+        return ResultGenerator.getSuccessResult(orderRedeemLogService.removeByIds(orderRedeemLogIds));
+    }
+}

+ 88 - 0
Source/group-platform/admin/src/main/java/com/younike/store/controller/AppUserController.java

@@ -0,0 +1,88 @@
+package com.younike.store.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.younike.common.bean.APIResult;
+import com.younike.common.bean.ResultGenerator;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import com.younike.common.core.page.PageParam;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.younike.common.annotation.OpLog;
+import com.younike.common.core.controller.BaseController;
+import com.younike.common.core.dto.AjaxResult;
+import com.younike.common.constant.BusinessType;
+import com.younike.service.pojo.AppUser;
+import com.younike.service.service.IAppUserService;
+import com.younike.common.core.page.TableResult;
+
+/**
+ * 商家(员工)用户Controller
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@RestController
+@RequestMapping("/appUser")
+public class AppUserController extends BaseController {
+    @Autowired
+    private IAppUserService appUserService;
+
+    /**
+     * 查询商家(员工)用户列表
+     */
+    @RequiresPermissions("user:list")
+    @PostMapping("/list")
+    public Page list(@RequestBody PageParam<AppUser> page) {
+
+        return appUserService.page(page);
+    }
+
+
+    /**
+     * 获取商家(员工)用户详细信息
+     */
+    @RequiresPermissions("user:query")
+    @GetMapping(value = "/{appUserId}")
+    public APIResult getInfo(@PathVariable("appUserId") String appUserId) {
+        return ResultGenerator.getSuccessResult(appUserService.getById(appUserId));
+    }
+
+    /**
+     * 新增商家(员工)用户
+     */
+    @RequiresPermissions("user:add")
+    @OpLog(title = "商家(员工)用户", type = BusinessType.INSERT)
+    @PostMapping
+    public APIResult add(@RequestBody AppUser appUser) {
+        return ResultGenerator.getSuccessResult(appUserService.save(appUser));
+    }
+
+    /**
+     * 修改商家(员工)用户
+     */
+    @RequiresPermissions("user:edit")
+    @OpLog(title = "商家(员工)用户", type = BusinessType.UPDATE)
+    @PutMapping
+    public APIResult edit(@RequestBody AppUser appUser) {
+        return ResultGenerator.getSuccessResult(appUserService.updateById(appUser));
+    }
+
+    /**
+     * 删除商家(员工)用户
+     */
+    @RequiresPermissions("user:remove")
+    @OpLog(title = "商家(员工)用户", type = BusinessType.DELETE)
+    @DeleteMapping("/{appUserIds}")
+    public APIResult remove(@PathVariable List<String> appUserIds) {
+        return ResultGenerator.getSuccessResult(appUserService.removeByIds(appUserIds));
+    }
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/AppMemberVlogAttachMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.AppMemberVlogAttach;
+
+/**
+ * 会员日记附件信息Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface AppMemberVlogAttachMapper extends BaseMapper<AppMemberVlogAttach> {
+
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/AppUserMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.AppUser;
+
+/**
+ * 商家(员工)用户Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface AppUserMapper extends BaseMapper<AppUser> {
+
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderGoodsMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.OrderGoods;
+
+/**
+ * 订单明细Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
+
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderGpDetailMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.OrderGpDetail;
+
+/**
+ * 门店订单团购套餐内容商品信息Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface OrderGpDetailMapper extends BaseMapper<OrderGpDetail> {
+
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.Order;
+
+/**
+ * 订单Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface OrderMapper extends BaseMapper<Order> {
+
+}

+ 14 - 0
Source/group-platform/service/src/main/java/com/younike/service/mapper/OrderRedeemLogMapper.java

@@ -0,0 +1,14 @@
+package com.younike.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.younike.service.pojo.OrderRedeemLog;
+
+/**
+ * 门店订单核销记录(订单与核销码一对多)Mapper接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface OrderRedeemLogMapper extends BaseMapper<OrderRedeemLog> {
+
+}

+ 56 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/AppMemberVlogAttach.java

@@ -0,0 +1,56 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 会员日记附件信息对象 app_member_vlog_attach
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class AppMemberVlogAttach extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 会员日记附件id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String memberVlogAttachId;
+
+    /** 会员日记ID(关联表app_member_vlog) */
+    private String vlogId;
+
+    /** 附件类型;001-图片、002-视频 */
+    private String vlogAttachType;
+
+    /** 附件链接 */
+    private String vlogAttachUrl;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 78 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/AppUser.java

@@ -0,0 +1,78 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 商家(员工)用户对象 app_user
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class AppUser extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 商家(员工)用户id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String appUserId;
+
+    /** 账号类型(枚举:001-门店管理员(商家端申请店铺注册人员)、002-门店员工(商家端用户)) */
+    private String userType;
+
+    /** 真实姓名 */
+    private String realName;
+
+    /** 昵称 */
+    private String nickName;
+
+    /** 注册手机号 */
+    private String phone;
+
+    /** 帐号状态(0-正常;1-停用;默认0) */
+    private String status;
+
+    /** 性别(0-男;1-女;2-未知;默认2) */
+    private String gender;
+
+    /** 头像图片(暂不支持上传头像) */
+    private String avatar;
+
+    /** 加密后的密码 */
+    private String password;
+
+    /** 最近登录IP */
+    private String lastLoginIp;
+
+    /** 最近登录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String lastLoginDate;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 105 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/Order.java

@@ -0,0 +1,105 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单对象 order
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class Order extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 订单id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String orderId;
+
+    /** 订单编号 */
+    private String orderIndex;
+
+    /** 下单会员用户ID(关联app_member) */
+    private String appMemberId;
+
+    /** 订单类型;枚举:001-代金券、002-团购套餐等 */
+    private String orderType;
+
+    /** 门店ID(关联store) */
+    private String storeId;
+
+    /** 订单总金额 */
+    private BigDecimal orderAmount;
+
+    /** 订单实付金额 */
+    private BigDecimal totalAmount;
+
+    /** 优惠金额 */
+    private BigDecimal couponAmount;
+
+    /** 下单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String orderTime;
+
+    /** 订单中购买商品数量(优惠券张数或套餐的份数) */
+    private Long orderGoodsTotalQty;
+
+    /** 订单中未核销/未使用商品数量(未核销的优惠券张数或套餐的份数) */
+    private Long orderGoodsRemainingQty;
+
+    /** 当前订单状态;枚举:001-待支付、099-已取消、002-待核销、003-部分核销、004-核销完成、005-申请退款、006-部分退款、007-已退款 */
+    private String orderStatus;
+
+    /** 是否待评价 (0-待评价;1-已评价;默认0;订单状态为“核销完成”时,更新该字段为0,客户评价后,更新该字段为1) */
+    private String isPendingEvaluate;
+
+    /** 支付方式;枚举:001-微信、002-支付宝 */
+    private String payWay;
+
+    /** 支付状态  (0-待支付;1-已支付;默认0) */
+    private String isPaid;
+
+    /** 商家分账金额 */
+    private BigDecimal shopAmount;
+
+    /** 平台分账金额 */
+    private BigDecimal platformAmount;
+
+    /** 删除人ID (关联表app_member) */
+    private String delBy;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String delTime;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 93 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderGoods.java

@@ -0,0 +1,93 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单明细对象 order_goods
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class OrderGoods extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 订单明细id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String orderGoodsId;
+
+    /** 订单ID */
+    private String orderId;
+
+    /** 订单编号 */
+    private String orderIndex;
+
+    /** 下单会员用户ID(关联app_member) */
+    private String appMemberId;
+
+    /** 商品id(关联goods) */
+    private String goodsId;
+
+    /** 商品名称 */
+    private String goodsName;
+
+    /** 划线价格/门市价格 */
+    private BigDecimal retailPrice;
+
+    /** 商品售价 */
+    private BigDecimal salePrice;
+
+    /** 单人最多可购买券张数 */
+    private Long maxBuyQtyPerPerson;
+
+    /** 每单限用券张数 */
+    private Long maxUseQtyPerOrder;
+
+    /** 有效期开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String validFrom;
+
+    /** 有效期结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String validUntil;
+
+    /** 周末/节假日是否限制(0-通用;1-周末不可用;2-法定节假日不可用;3-周末/法定节假日都不可用;) */
+    private String isHolidayRestricted;
+
+    /** 适用范围,枚举:(0-全场通用;1-只适用于菜品;) */
+    private String validScope;
+
+    /** 使用规则/购买须知 文字描述 */
+    private String commonRules;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 73 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderGpDetail.java

@@ -0,0 +1,73 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 门店订单团购套餐内容商品信息对象 order_gp_detail
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class OrderGpDetail extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 团购套餐内容商品信息id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String orderGpDetailId;
+
+    /** 订单ID */
+    private String orderId;
+
+    /** 订单编号 */
+    private String orderIndex;
+
+    /** 订单商品ID(关联goods) */
+    private String goodsId;
+
+    /** 团购套餐商品包含的内容商品ID(关联表gp_content_product) */
+    private String contentProductId;
+
+    /** 商品/菜品名称 */
+    private String contentProductName;
+
+    /** 价格 */
+    private BigDecimal contentProductPrice;
+
+    /** 商品/菜品图片(暂支持上传一张图片) */
+    private String contentProductImgUrl;
+
+    /** 团购商品套餐内具体的商品数量 */
+    private Long contentProductQty;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 66 - 0
Source/group-platform/service/src/main/java/com/younike/service/pojo/OrderRedeemLog.java

@@ -0,0 +1,66 @@
+package com.younike.service.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.younike.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 门店订单核销记录(订单与核销码一对多)对象 order_redeem_log
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Data
+public class OrderRedeemLog extends BaseEntity {
+    private static final long serialVersionUID=1L;
+
+    /** 订单核销码记录ID */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String orderRedeemLogId;
+
+    /** 订单ID */
+    private String orderId;
+
+    /** 订单编号 */
+    private String orderIndex;
+
+    /** 核销码(券码),已支付的订单自动生成一个或多个核销码 */
+    private String redeemCode;
+
+    /** 核销码状态;枚举:0-无效(退款订单、过有效期订单等)、1-有效 */
+    private String redeemCodeStatus;
+
+    /** 核销时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String redeemdTime;
+
+    /** 核销人ID(店员表store_staff) */
+    private String redeemedBy;
+
+    /** 删除标签(0-正常;1-已删除;默认0) */
+    private String delFlag;
+
+    /** 创建人ID */
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdTime;
+
+    /** 更新人ID */
+    private String updatedBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updatedTime;
+
+    /** 版本号(默认0) */
+    @Version
+    private Long version;
+
+
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IAppMemberVlogAttachService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.AppMemberVlogAttach;
+/**
+ * 会员日记附件信息Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IAppMemberVlogAttachService extends IService<AppMemberVlogAttach>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<AppMemberVlogAttach> page(PageParam<AppMemberVlogAttach> pageParam);
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IAppUserService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.AppUser;
+/**
+ * 商家(员工)用户Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IAppUserService extends IService<AppUser>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<AppUser> page(PageParam<AppUser> pageParam);
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IOrderGoodsService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.OrderGoods;
+/**
+ * 订单明细Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IOrderGoodsService extends IService<OrderGoods>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<OrderGoods> page(PageParam<OrderGoods> pageParam);
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IOrderGpDetailService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.OrderGpDetail;
+/**
+ * 门店订单团购套餐内容商品信息Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IOrderGpDetailService extends IService<OrderGpDetail>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<OrderGpDetail> page(PageParam<OrderGpDetail> pageParam);
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IOrderRedeemLogService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.OrderRedeemLog;
+/**
+ * 门店订单核销记录(订单与核销码一对多)Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IOrderRedeemLogService extends IService<OrderRedeemLog>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<OrderRedeemLog> page(PageParam<OrderRedeemLog> pageParam);
+
+}

+ 22 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/IOrderService.java

@@ -0,0 +1,22 @@
+package com.younike.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.pojo.Order;
+/**
+ * 订单Service接口
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+public interface IOrderService extends IService<Order>{
+
+
+    /**
+     * 重写分页器
+     * @param pageParam
+     * @return
+     */
+    public PageParam<Order> page(PageParam<Order> pageParam);
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/AppMemberVlogAttachServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.AppMemberVlogAttachMapper;
+import com.younike.service.pojo.AppMemberVlogAttach;
+import com.younike.service.service.IAppMemberVlogAttachService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 会员日记附件信息Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class AppMemberVlogAttachServiceImpl extends ServiceImpl<AppMemberVlogAttachMapper, AppMemberVlogAttach> implements IAppMemberVlogAttachService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<AppMemberVlogAttach> page(PageParam<AppMemberVlogAttach> pageParam) {
+
+        PageParam<AppMemberVlogAttach> page = this.page(pageParam, new LambdaQueryWrapper<AppMemberVlogAttach>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/AppUserServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.AppUserMapper;
+import com.younike.service.pojo.AppUser;
+import com.younike.service.service.IAppUserService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 商家(员工)用户Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<AppUser> page(PageParam<AppUser> pageParam) {
+
+        PageParam<AppUser> page = this.page(pageParam, new LambdaQueryWrapper<AppUser>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderGoodsServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.OrderGoodsMapper;
+import com.younike.service.pojo.OrderGoods;
+import com.younike.service.service.IOrderGoodsService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 订单明细Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements IOrderGoodsService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<OrderGoods> page(PageParam<OrderGoods> pageParam) {
+
+        PageParam<OrderGoods> page = this.page(pageParam, new LambdaQueryWrapper<OrderGoods>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderGpDetailServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.OrderGpDetailMapper;
+import com.younike.service.pojo.OrderGpDetail;
+import com.younike.service.service.IOrderGpDetailService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 门店订单团购套餐内容商品信息Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class OrderGpDetailServiceImpl extends ServiceImpl<OrderGpDetailMapper, OrderGpDetail> implements IOrderGpDetailService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<OrderGpDetail> page(PageParam<OrderGpDetail> pageParam) {
+
+        PageParam<OrderGpDetail> page = this.page(pageParam, new LambdaQueryWrapper<OrderGpDetail>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderRedeemLogServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.OrderRedeemLogMapper;
+import com.younike.service.pojo.OrderRedeemLog;
+import com.younike.service.service.IOrderRedeemLogService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 门店订单核销记录(订单与核销码一对多)Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class OrderRedeemLogServiceImpl extends ServiceImpl<OrderRedeemLogMapper, OrderRedeemLog> implements IOrderRedeemLogService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<OrderRedeemLog> page(PageParam<OrderRedeemLog> pageParam) {
+
+        PageParam<OrderRedeemLog> page = this.page(pageParam, new LambdaQueryWrapper<OrderRedeemLog>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 39 - 0
Source/group-platform/service/src/main/java/com/younike/service/service/impl/OrderServiceImpl.java

@@ -0,0 +1,39 @@
+package com.younike.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.younike.common.core.page.PageParam;
+import com.younike.service.mapper.OrderMapper;
+import com.younike.service.pojo.Order;
+import com.younike.service.service.IOrderService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 订单Service业务层处理
+ *
+ * @author dail
+ * @date 2022-05-24
+ */
+@Service
+@Transactional
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+
+    /**
+     * 自定义分页逻辑 这里就省略掉
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public PageParam<Order> page(PageParam<Order> pageParam) {
+
+        PageParam<Order> page = this.page(pageParam, new LambdaQueryWrapper<Order>()
+                //.like(Printer::getName,pageParam.getParam().getName())
+                // 查询逻辑 适合单表 多表 重写XML查询
+        );
+
+        return page;
+    }
+
+}

+ 29 - 0
Source/group-platform/service/src/main/resources/mapper/system/AppMemberVlogAttachMapper.xml

@@ -0,0 +1,29 @@
+<?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.younike.service.mapper.AppMemberVlogAttachMapper">
+
+    <resultMap type="com.younike.service.pojo.AppMemberVlogAttach" id="AppMemberVlogAttachResult">
+        <result property="memberVlogAttachId" column="member_vlog_attach_id"/>
+        <result property="vlogId" column="vlog_id"/>
+        <result property="vlogAttachType" column="vlog_attach_type"/>
+        <result property="vlogAttachUrl" column="vlog_attach_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectAppMemberVlogAttachVo">
+        select member_vlog_attach_id, vlog_id, vlog_attach_type, vlog_attach_url, del_flag, created_by, created_time, updated_by, updated_time, version, remark from app_member_vlog_attach
+    </sql>
+
+
+</mapper>

+ 36 - 0
Source/group-platform/service/src/main/resources/mapper/system/AppUserMapper.xml

@@ -0,0 +1,36 @@
+<?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.younike.service.mapper.AppUserMapper">
+
+    <resultMap type="com.younike.service.pojo.AppUser" id="AppUserResult">
+        <result property="appUserId" column="app_user_id"/>
+        <result property="userType" column="user_type"/>
+        <result property="realName" column="real_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="status" column="status"/>
+        <result property="gender" column="gender"/>
+        <result property="avatar" column="avatar"/>
+        <result property="password" column="password"/>
+        <result property="lastLoginIp" column="last_login_ip"/>
+        <result property="lastLoginDate" column="last_login_date"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectAppUserVo">
+        select app_user_id, user_type, real_name, nick_name, phone, status, gender, avatar, password, last_login_ip, last_login_date, del_flag, created_by, created_time, updated_by, updated_time, version, remark from app_user
+    </sql>
+
+
+</mapper>

+ 40 - 0
Source/group-platform/service/src/main/resources/mapper/system/OrderGoodsMapper.xml

@@ -0,0 +1,40 @@
+<?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.younike.service.mapper.OrderGoodsMapper">
+
+    <resultMap type="com.younike.service.pojo.OrderGoods" id="OrderGoodsResult">
+        <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="orderIndex" column="order_index"/>
+        <result property="appMemberId" column="app_member_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="retailPrice" column="retail_price"/>
+        <result property="salePrice" column="sale_price"/>
+        <result property="maxBuyQtyPerPerson" column="max_buy_qty_per_person"/>
+        <result property="maxUseQtyPerOrder" column="max_use_qty_per_order"/>
+        <result property="validFrom" column="valid_from"/>
+        <result property="validUntil" column="valid_until"/>
+        <result property="isHolidayRestricted" column="is_holiday_restricted"/>
+        <result property="validScope" column="valid_scope"/>
+        <result property="commonRules" column="common_rules"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectOrderGoodsVo">
+        select order_goods_id, order_id, order_index, app_member_id, goods_id, goods_name, retail_price, sale_price, max_buy_qty_per_person, max_use_qty_per_order, valid_from, valid_until, is_holiday_restricted, valid_scope, common_rules, del_flag, created_by, created_time, updated_by, updated_time, version, remark from order_goods
+    </sql>
+
+
+</mapper>

+ 34 - 0
Source/group-platform/service/src/main/resources/mapper/system/OrderGpDetailMapper.xml

@@ -0,0 +1,34 @@
+<?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.younike.service.mapper.OrderGpDetailMapper">
+
+    <resultMap type="com.younike.service.pojo.OrderGpDetail" id="OrderGpDetailResult">
+        <result property="orderGpDetailId" column="order_gp_detail_id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="orderIndex" column="order_index"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="contentProductId" column="content_product_id"/>
+        <result property="contentProductName" column="content_product_name"/>
+        <result property="contentProductPrice" column="content_product_price"/>
+        <result property="contentProductImgUrl" column="content_product_img_url"/>
+        <result property="contentProductQty" column="content_product_qty"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectOrderGpDetailVo">
+        select order_gp_detail_id, order_id, order_index, goods_id, content_product_id, content_product_name, content_product_price, content_product_img_url, content_product_qty, del_flag, created_by, created_time, updated_by, updated_time, version, remark from order_gp_detail
+    </sql>
+
+
+</mapper>

+ 44 - 0
Source/group-platform/service/src/main/resources/mapper/system/OrderMapper.xml

@@ -0,0 +1,44 @@
+<?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.younike.service.mapper.OrderMapper">
+
+    <resultMap type="com.younike.service.pojo.Order" id="OrderResult">
+        <result property="orderId" column="order_id"/>
+        <result property="orderIndex" column="order_index"/>
+        <result property="appMemberId" column="app_member_id"/>
+        <result property="orderType" column="order_type"/>
+        <result property="storeId" column="store_id"/>
+        <result property="orderAmount" column="order_amount"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="couponAmount" column="coupon_amount"/>
+        <result property="orderTime" column="order_time"/>
+        <result property="orderGoodsTotalQty" column="order_goods_total_qty"/>
+        <result property="orderGoodsRemainingQty" column="order_goods_remaining_qty"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="isPendingEvaluate" column="is_pending_evaluate"/>
+        <result property="payWay" column="pay_way"/>
+        <result property="isPaid" column="is_paid"/>
+        <result property="shopAmount" column="shop_amount"/>
+        <result property="platformAmount" column="platform_amount"/>
+        <result property="delBy" column="del_by"/>
+        <result property="delTime" column="del_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectOrderVo">
+        select order_id, order_index, app_member_id, order_type, store_id, order_amount, total_amount, coupon_amount, order_time, order_goods_total_qty, order_goods_remaining_qty, order_status, is_pending_evaluate, pay_way, is_paid, shop_amount, platform_amount, del_by, del_time, del_flag, created_by, created_time, updated_by, updated_time, version, remark from order
+    </sql>
+
+
+</mapper>

+ 32 - 0
Source/group-platform/service/src/main/resources/mapper/system/OrderRedeemLogMapper.xml

@@ -0,0 +1,32 @@
+<?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.younike.service.mapper.OrderRedeemLogMapper">
+
+    <resultMap type="com.younike.service.pojo.OrderRedeemLog" id="OrderRedeemLogResult">
+        <result property="orderRedeemLogId" column="order_redeem_log_id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="orderIndex" column="order_index"/>
+        <result property="redeemCode" column="redeem_code"/>
+        <result property="redeemCodeStatus" column="redeem_code_status"/>
+        <result property="redeemdTime" column="redeemd_time"/>
+        <result property="redeemedBy" column="redeemed_by"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+    <sql id="selectOrderRedeemLogVo">
+        select order_redeem_log_id, order_id, order_index, redeem_code, redeem_code_status, redeemd_time, redeemed_by, del_flag, created_by, created_time, updated_by, updated_time, version, remark from order_redeem_log
+    </sql>
+
+
+</mapper>