submit

zhongzheng-admin-store/src/main/java/com/zhongzheng/controller/store/OrderController.java

@@ -0,0 +1,50 @@
+package com.zhongzheng.controller.store;
+
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.model.StoreLoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.StoreTokenService;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.order.bo.OrderAddBo;
+import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.vo.StoreUserDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 商户店铺管理Controller
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Api(value = "商户店铺订单管理控制器", tags = {"商户店铺订单管理控制器"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/store/order")
+public class OrderController extends BaseController {
+
+    private final IOrderService orderService;
+
+    private final StoreTokenService tokenService;
+
+
+
+    /**
+     * 新增订单
+     */
+    @ApiOperation("新增PC网站订单")
+    @PostMapping("/placePcOrder")
+    public AjaxResult addPc(@RequestBody OrderAddBo bo) {
+        StoreLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(orderService.placePcOrder(bo));
+    }
+
+}

zhongzheng-admin-store/src/main/java/com/zhongzheng/controller/store/UserController.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.controller.store;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.store.vo.StoreUserVo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
+import com.zhongzheng.modules.top.mall.service.ITopStoreService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
+import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.vo.StoreUserDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 商户店铺管理Controller
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Api(value = "商户店铺会员管理控制器", tags = {"商户店铺会员管理控制器"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/store/user")
+public class UserController extends BaseController {
+
+    private final IUserService userService;
+
+    /**
+     * 积分商品详情
+     */
+    @ApiOperation("获取会员详情")
+    @GetMapping("/detail/{cardSn}")
+    public AjaxResult<StoreUserDetailVo> getStoreUserDetail(@PathVariable("cardSn")String cardSn) {
+        return AjaxResult.success(userService.getStoreUserDetail(cardSn));
+    }
+
+}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1258,6 +1258,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return true;
     }
 
+    @Override
+    public StoreUserDetailVo getStoreUserDetail(String cardSn) {
+        User user = getOne(new LambdaQueryWrapper<User>().eq(User::getVipCard, cardSn));
+        if (ObjectUtil.isNull(user) || user.getStatus() != 1){
+            throw new CustomException("会员卡已失效!");
+        }
+        StoreUserDetailVo vo = new StoreUserDetailVo();
+        vo.setUserId(user.getUserId());
+        vo.setCardSn(user.getVipCard());
+        vo.setUserName(user.getRealname());
+        vo.setTelphone(EncryptHandler.decrypt(user.getTelphone()));
+        vo.setPointsValue(user.getPointsValue());
+        return vo;
+    }
+
     private Long findSubjectId(String subject){
         if(subject!=null){
             String key = "SUB_"+subject;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/IntegralOrderAddBo.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单添加对象")
+public class IntegralOrderAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 订单价格 */
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+    /** 支付订单号 */
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+    /** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+    private Integer orderStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 支付时间 */
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+    /** 支付平台 1微信 2支付宝 */
+    @ApiModelProperty("支付平台 1微信 2支付宝")
+    private Integer payType;
+    /** 微信流水号 */
+    @ApiModelProperty("微信流水号")
+    private String transid;
+    /** 关闭时间 */
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+    /** 订单完成时间 */
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+    /** 订单类型   1充值订单 2商品普通订单 */
+    @ApiModelProperty("订单类型   1充值订单 2商品普通订单")
+    private Integer orderType;
+    /** 支付价格 */
+    @ApiModelProperty("支付价格")
+    private BigDecimal payPrice;
+    /** 收费方式 1即刻收费 2稍后收费 */
+    @ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+    private Integer chargingType;
+    /** 订单来源 1业务员录单 */
+    @ApiModelProperty("订单来源 1业务员普通单 2祥粤云学堂小程序 3祥粤云学堂网站 4祥粤e管证小程序 5业务员录单 6业务系统下单 ")
+    private Integer orderFrom;
+    @ApiModelProperty("商品列表")
+    private List<OrderGoodsAddBo> goodsList;
+    @ApiModelProperty("业务信息")
+    private OrderBusinessAddBo orderBusiness;
+    @ApiModelProperty("学员信息")
+    private OrderStudentInfoAddBo OrderStudent;
+    /** 系统订单操作人 */
+    @ApiModelProperty("系统订单操作人")
+    private String createBy;
+    private String createUsername;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 系统订单操作人ID */
+    @ApiModelProperty("系统订单操作人ID")
+    private Long createSysUserId;
+    /** 录单订单编号 */
+    @ApiModelProperty("录单订单编号")
+    private String inputOrderSn;
+    /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+    @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+    private Integer payStatus;
+    @ApiModelProperty("公众号页面url")
+    private String url;
+    @ApiModelProperty("订单机构标识（旧系统）")
+    private Integer orderOrg;
+    @ApiModelProperty("红包活动码")
+    private String shareActivityCode;
+    @ApiModelProperty("业务员名称")
+    private String sellerName;
+    @ApiModelProperty("底单：1新系统，2旧系统")
+    private Integer orderBase;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -140,4 +140,6 @@ public interface IUserService extends IService<User> {
 	List<UserVipExportVo> vipUserListExport(UserQueryBo bo);
 
 	Boolean rechargeBatchVip(UserEditBo bo);
+
+	StoreUserDetailVo getStoreUserDetail(String cardSn);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/StoreUserDetailVo.java

@@ -0,0 +1,32 @@
+package com.zhongzheng.modules.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yangdamao
+ * @date 2023年06月06日 9:11
+ */
+@Data
+@ApiModel("店铺会员对象")
+public class StoreUserDetailVo implements Serializable {
+
+    private Long userId;
+
+    @ApiModelProperty("会员卡号")
+    private String cardSn;
+
+    @ApiModelProperty("积分")
+    private BigDecimal pointsValue;
+
+    @ApiModelProperty("姓名")
+    private String userName;
+
+    @ApiModelProperty("电话")
+    private String telphone;
+}