Merge remote-tracking branch 'origin/dev' into test

cash-api/account-server/src/main/java/com/czg/controller/admin/MemberController.java

@@ -0,0 +1,103 @@
+package com.czg.controller.admin;
+
+import com.czg.account.dto.MemberConfigDTO;
+import com.czg.account.dto.MemberLevelDTO;
+import com.czg.account.entity.MemberLevelConfig;
+import com.czg.account.service.TbMemberConfigService;
+import com.czg.account.vo.MemberConfigVO;
+import com.czg.account.vo.MemberLevelVO;
+import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
+import com.czg.validator.group.UpdateGroup;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
+import jakarta.validation.groups.Default;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+
+/**
+ * 会员配置管理
+ */
+
+@RestController
+@RequestMapping("/admin/member")
+public class MemberController {
+    @Resource
+    private TbMemberConfigService memberConfigService;
+
+    /**
+     * 配置信息获取
+     * 权限标识: activate:list
+     */
+//    @SaAdminCheckPermission(value = "member:detail", name = "会员配置列表")
+    @GetMapping
+    public CzgResult<MemberConfigVO> detail() {
+        return CzgResult.success(memberConfigService.detail(StpKit.USER.getShopId()));
+    }
+
+    /**
+     * 配置信息修改
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @PostMapping
+    public CzgResult<Boolean> edit(@Validated @RequestBody MemberConfigDTO memberDTO) {
+        return CzgResult.success(memberConfigService.edit(StpKit.USER.getShopId(), memberDTO));
+    }
+
+
+    /**
+     * 会员等级添加
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @PostMapping("/level")
+    public CzgResult<Boolean> addLevel(@Validated @RequestBody MemberLevelDTO levelDTO) {
+        return CzgResult.success(memberConfigService.addLevel(StpKit.USER.getShopId(), levelDTO));
+    }
+
+    /**
+     * 会员等级修改
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @PutMapping("/level")
+    public CzgResult<Boolean> editLevel(@Validated({UpdateGroup.class, Default.class}) @RequestBody MemberLevelDTO levelDTO) {
+        return CzgResult.success(memberConfigService.editLevel(StpKit.USER.getShopId(), levelDTO));
+    }
+
+    /**
+     * 会员等级删除
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @DeleteMapping("/level/{id}")
+    public CzgResult<Boolean> deleteLevel(@PathVariable Long id) {
+        return CzgResult.success(memberConfigService.remove(new QueryWrapper().eq(MemberLevelDTO::getId, id).eq(MemberLevelConfig::getShopId, StpKit.USER.getShopId())));
+    }
+
+    /**
+     * 会员等级列表
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @GetMapping("/level/list")
+    public CzgResult<ArrayList<MemberLevelVO>> levelList() {
+        return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getShopId()));
+    }
+
+
+    /**
+     * 会员等级详情
+     * @return 是否成功
+     */
+//    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
+    @PutMapping("/level/detail")
+    public CzgResult<ArrayList<MemberLevelVO>> levelList(@RequestParam Integer id) {
+        return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getShopId()));
+    }
+
+
+}

cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java

@@ -5,6 +5,7 @@ import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.entity.resp.CzgBaseResp;
 import com.czg.order.entity.OrderInfo;
 import com.czg.resp.CzgResult;
+import com.czg.service.order.dto.VipMemberPayParamDTO;
 import com.czg.service.order.dto.VipPayParamDTO;
 import com.czg.service.order.dto.VipRefundDTO;
 import com.czg.service.order.service.PayService;
@@ -69,6 +70,21 @@ public class VipPayController {
         return payService.ltPayVip(ServletUtil.getClientIP(request), payParam);
     }
 
+    /**
+     * 会员购买支付
+     * @param request
+     * @param payParam
+     * @return
+     */
+    @PostMapping("/ltPayMember")
+    @Debounce(value = "#payParam.memberOrderId")
+    public CzgResult<Map<String, Object>> ltPayMember(HttpServletRequest request, @Validated @RequestBody VipMemberPayParamDTO payParam) {
+        AssertUtil.isNull(payParam.getShopUserId(), "购买失败 未指定店铺用户Id");
+        payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
+        return payService.ltPayMember(ServletUtil.getClientIP(request), payParam);
+    }
+
+
     /**
      * 正扫
      */

cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java

@@ -2,10 +2,13 @@ package com.czg.controller.user;
 
 import com.czg.annotation.Debounce;
 import com.czg.exception.CzgException;
+import com.czg.order.dto.MemberOrderDTO;
 import com.czg.order.dto.OrderCannelDTO;
 import com.czg.order.dto.OrderInfoAddDTO;
 import com.czg.order.dto.OrderInfoQueryDTO;
+import com.czg.order.entity.MemberOrder;
 import com.czg.order.entity.OrderInfo;
+import com.czg.order.service.MemberOrderService;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
@@ -35,6 +38,8 @@ public class UserOrderController {
     @Resource
     private OrderInfoService orderInfoService;
 
+    @Resource
+    private MemberOrderService memberOrderService;
     /**
      * 订单列表
      */
@@ -70,6 +75,21 @@ public class UserOrderController {
         return CzgResult.success(orderInfoService.createOrder(addDto));
     }
 
+    /**
+     * 会员购买
+     * @param orderDTO 充值信息
+     * @return
+     */
+    @PostMapping("/createMemberOrder")
+    public CzgResult<MemberOrder> createMemberOrder(@Validated @RequestBody MemberOrderDTO orderDTO) {
+        orderDTO.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
+        orderDTO.setUserId(StpKit.USER.getLoginIdAsLong());
+        orderDTO.setShopId(StpKit.USER.getShopId());
+        orderDTO.setOrderType("miniapp");
+        return CzgResult.success(memberOrderService.createMemberOrder(orderDTO));
+    }
+
+
     @PutMapping("/{id}")
     public CzgResult<Void> upOrderIsDel(@PathVariable("id") Long id) {
         //效验数据