zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/2/head
TianYu 2023-05-19 19:03:40 +08:00
parent 87a50fa476 ea288188e8
commit d8f9dd9479
44 changed files with 368 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
View File

@ -137,6 +137,13 @@ public class GlobalExceptionHandler {
assert fieldError != null; // 断言，避免告警
return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage()));
}
@ExceptionHandler(IllegalArgumentException.class)
public CommonResult<?> IllegalArgumentExceptionHandler(BindException ex) {
log.warn("[IllegalArgumentException]", ex);
FieldError fieldError = ex.getFieldError();
assert fieldError != null; // 断言，避免告警
return CommonResult.error(INTERNAL_SERVER_ERROR.getCode(), fieldError.getDefaultMessage());
}
/**
* 处理 Validator 校验不通过产生的异常

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java
View File

@ -135,6 +135,8 @@ public class WxPayNotifyController {
log.error("支付金额不匹配,订单实际支付金额:{},微信入参验证金额:{}", orderDO.getPayPrice(), payerTotal);
return "failure";
}
orderDO.setRefundStatus(2);
rechargeOrderMapper.updateById(orderDO);
// 修改订单状态
// 写入
response.setStatus(HttpServletResponse.SC_OK);

19
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
View File

@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.shop.controller.admin.recharge;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.shop.controller.admin.recharge.method.Excel;
import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderInfoConvert;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
@ -46,7 +48,7 @@ public class RechargeOrderController {
@PostMapping("/create")
@Operation(summary = "创建订单")
@PreAuthorize("@ss.hasPermission('shop:recharge-order:create')")
public CommonResult<Integer> createRechargeOrder(@Valid @RequestBody RechargeOrderCreateReqVO createReqVO) {
public CommonResult<Long> createRechargeOrder(@Valid @RequestBody RechargeOrderCreateReqVO createReqVO) {
return success(rechargeOrderService.createRechargeOrder(createReqVO));
}
@ -88,7 +90,9 @@ public class RechargeOrderController {
@GetMapping("/page")
@Operation(summary = "获得订单分页")
@PreAuthorize("@ss.hasPermission('shop:recharge-order:query')")
@TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) {
pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO);
return success(pageResult);
}
@ -98,18 +102,17 @@ public class RechargeOrderController {
@Operation(summary = "导出订单 Excel")
@PreAuthorize("@ss.hasPermission('shop:recharge-order:export')")
@OperateLog(type = EXPORT)
@TenantIgnore
public void exportRechargeOrderExcel(@Valid RechargeOrderExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<RechargeOrderDO> list = rechargeOrderService.getRechargeOrderList(exportReqVO);
ArrayList<String> s = new ArrayList<>();
List<RechargeOrderExcelVO> list = rechargeOrderService.findListExcel(exportReqVO);
ArrayList<Long> s = new ArrayList<>();
list.forEach(x -> {
s.add(x.getOrderId());
s.add(x.getId());
});
List<RechargeOrderInfoDO> infoList = rechargeOrderInfoService.getRechargeOrderInfoList(s);
List<RechargeOrderInfoExcelVO> infoList = rechargeOrderInfoService.getRechargeOrderInfoListExcel(s);
// 导出 Excel
List<RechargeOrderExcelVO> datas = RechargeOrderConvert.INSTANCE.convertList02(list);
List<RechargeOrderInfoExcelVO> infoDatas = RechargeOrderInfoConvert.INSTANCE.convertList02(infoList);
Excel.orderExport(response, datas, infoDatas);
Excel.orderExport(response, list, infoList);
}
}

11
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeGearBaseVO.java
View File

@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.shop.controller.admin.recharge.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -24,6 +26,13 @@ public class RechargeGearBaseVO {
@Schema(description = "档位显示金额", required = true)
@NotNull(message = "档位显示金额不能为空")
private Integer gearAmount;
private BigDecimal gearAmount;
/**
* 返费金额
*/
@Schema(description = "返费金额", required = true)
@NotNull(message = "返费金额不能为空")
private BigDecimal refundAmount;
}

35
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExcelVO.java
View File

@ -14,36 +14,43 @@ import java.time.LocalDateTime;
@Data
public class RechargeOrderExcelVO {
@ExcelProperty("订单号")
@ExcelProperty("订单id")
private Long id;
@ExcelProperty("订单编号")
private String orderId;
@ExcelProperty("第三方支付流水号")
@ExcelProperty("交易流水号")
private String paySerialNumber;
@ExcelProperty("商户名称")
private String tenantName;
@ExcelProperty("支付时间")
@ExcelProperty("订单支付时间")
private LocalDateTime payTime;
//:0-普通订单，1-视频号订单
@ExcelProperty("交易完成时间")
private LocalDateTime payCompleteTime;
@ExcelProperty("订单类型")
private Integer type;
//（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
private String type="普通订单";
@ExcelProperty("订单状态")
private String status;
private String status="已经完成";
@ExcelProperty("配送方式")
private String deliveryType;
private String deliveryType="快递(系统快递)(系统快递)";
@ExcelProperty("用户姓名")
@ExcelProperty("姓名")
private String realName;
@ExcelProperty("用户电话")
@ExcelProperty("充值号码")
private String userPhone;
@ExcelProperty("确认手机号")
@ExcelProperty("确认号码")
private String confirmPhone;
@ExcelProperty("地址")
private String address;
@ExcelProperty("备注")
@ExcelProperty("给卖家留言")
private String mark;
@ExcelProperty("取货地址")
@ -59,7 +66,7 @@ public class RechargeOrderExcelVO {
private String remark;
@ExcelProperty("产品合计金额")
private BigDecimal proTotalPrice;
private BigDecimal totalPrice;
@ExcelProperty("运费")
private BigDecimal shipPrice;
@ -74,6 +81,6 @@ public class RechargeOrderExcelVO {
private String promoter;
@ExcelProperty("组织名称")
private Integer depName;
private String depName;
}

7
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
View File

@ -18,12 +18,19 @@ public class RechargeOrderExportReqVO {
@Schema(description = "订单号", example = "3697")
private String orderId;
@Schema(description = "租户id")
private Long tenantId;
@Schema(description = "用户id", example = "28969")
private Integer uid;
@Schema(description = "用户姓名", example = "张三")
private String realName;
@Schema(description = "推广员名称", example = "张三")
private String nickname;
@Schema(description = "用户电话")
private String userPhone;

13
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderInfoExcelVO.java
View File

@ -18,7 +18,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
@Data
public class RechargeOrderInfoExcelVO {
@ExcelProperty("订单号")
@ExcelProperty("订单编号")
private String orderNo;
@ExcelProperty("商户名称")
@ -31,18 +31,19 @@ public class RechargeOrderInfoExcelVO {
private String shopOption;
@ExcelProperty("产品分类")
private String productCategory;
private String productCategory="话费";
@ExcelProperty("产品价格")
@ExcelProperty("产品单价")
private BigDecimal price;
@ExcelProperty("产品数量")
private Integer payNum;
private Integer payNum=1;
@ExcelProperty("配送价格/运费")
private BigDecimal freight=new BigDecimal(0);
@ExcelProperty("合计金额")
private BigDecimal proTotalPrice;
@ExcelProperty("支付金额")
@ExcelProperty("实付金额")
private BigDecimal payPrice;
@ExcelProperty("售后状态")

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
View File

@ -20,6 +20,9 @@ public class RechargeOrderPageReqVO extends PageParam {
@Schema(description = "订单号", example = "3697")
private String orderId;
@Schema(description = "租户id")
private Long tenantId;
@Schema(description = "用户id", example = "28969")
private Integer uid;

41
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/banner/AppBannerController.java Normal file
View File

@ -0,0 +1,41 @@
package cn.iocoder.yudao.module.shop.controller.app.banner;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.shop.controller.admin.banner.vo.BannerPageReqVO;
import cn.iocoder.yudao.module.shop.controller.admin.banner.vo.BannerRespVO;
import cn.iocoder.yudao.module.shop.convert.banner.BannerConvert;
import cn.iocoder.yudao.module.shop.dal.dataobject.banner.BannerDO;
import cn.iocoder.yudao.module.shop.service.banner.BannerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "用户APP - 商户Banner 管理")
@RestController
@RequestMapping("/market/banner")
@Validated
public class AppBannerController {
@Resource
private BannerService bannerService;
@PostMapping("/list")
@Operation(summary = "获得 Banner 列表")
public CommonResult<PageResult<BannerRespVO>> getBannerList(@RequestBody@Valid BannerPageReqVO pageVO) {
pageVO.setTenantId(TenantContextHolder.getTenantId());
pageVO.setPageSize(5);
PageResult<BannerDO> pageResult = bannerService.getBannerPage(pageVO);
return success(BannerConvert.INSTANCE.convertPage(pageResult));
}
}

10
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeGearDO.java
View File

@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -38,6 +40,12 @@ public class RechargeGearDO extends BaseDO {
/**
* 档位显示金额
*/
private Integer gearAmount;
private BigDecimal gearAmount;
/**
* 返费金额
*/
private BigDecimal refundAmount;
}

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
@ -29,13 +30,13 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RechargeOrderDO extends BaseDO {
public class RechargeOrderDO extends TenantBaseDO {
/**
* 订单ID
*/
@TableId(type=IdType.ASSIGN_ID)
private Integer id;
private Long id;
/**
* 订单号
*/

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@ -22,7 +23,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RechargeOrderInfoDO extends BaseDO {
public class RechargeOrderInfoDO extends TenantBaseDO {
/**
* 主键
@ -32,7 +33,7 @@ public class RechargeOrderInfoDO extends BaseDO {
/**
* 充值订单id
*/
private Integer rechargeOrderId;
private Long rechargeOrderId;
/**
* 充值档位
*/

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RefundFeeRecordDO.java
View File

@ -26,7 +26,7 @@ public class RefundFeeRecordDO extends BaseDO {
/**
* 主键
*/
@TableId
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 档位记录id

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderInfoMapper.java
View File

@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
import org.apache.ibatis.annotations.Param;
/**
* 订单购物详情 Mapper
@ -54,4 +55,7 @@ public interface RechargeOrderInfoMapper extends BaseMapperX<RechargeOrderInfoDO
}
List<RechargeOrderInfoExcelVO> getRechargeOrderInfoListExcel(@Param("ids") List<Long> ids);
}

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderMapper.java
View File

@ -57,6 +57,9 @@ public interface RechargeOrderMapper extends BaseMapperX<RechargeOrderDO> {
.orderByDesc(RechargeOrderDO::getId));
}
IPage<RechargeOrderRespVO> findListPage(IPage<RechargeOrderRespVO> page, @Param("data") RechargeOrderPageReqVO data);
List<RechargeOrderExcelVO> findListExcel(@Param("data") RechargeOrderExportReqVO data);
default List<RechargeOrderDO> selectList(RechargeOrderExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<RechargeOrderDO>()
.eqIfPresent(RechargeOrderDO::getOrderId, reqVO.getOrderId())

6
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -14,6 +14,8 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.pay.properties.AliPayProperties;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
@ -1149,6 +1151,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
}
@Override
@TenantIgnore
@Transactional
public InitOrderResponse memberTopUp(OrderContentRequest request, HttpServletRequest servletRequest) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@ -1352,6 +1355,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user, PromoterDTO promoterDTO) {
Long tenantId = TenantContextHolder.getTenantId();
RechargeOrderDO orderDO = new RechargeOrderDO();
List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos();
orderDO.setOrderId(code);
@ -1372,6 +1376,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
orderDO.setBeforePayPrice(sum);
orderDO.setPromoterId(user.getPromoterId());
orderDO.setDeptId(promoterDTO.getDeptId());
orderDO.setTenantId(tenantId);
rechargeOrderMapper.insert(orderDO);
List<RechargeOrderInfoDO> infoDOS = new ArrayList<>();
orderInfos.forEach(info -> {
@ -1387,6 +1392,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
infoDO.setDeptId(promoterDTO.getDeptId());
infoDO.setUid(user.getId());
infoDO.setRechargeGearId(info.getGearId());
infoDO.setTenantId(tenantId);
infoDOS.add(infoDO);
});
rechargeOrderInfoMapper.insertBatch(infoDOS);

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderInfoService.java
View File

@ -67,6 +67,6 @@ public interface RechargeOrderInfoService {
*/
List<RechargeOrderInfoDO> getRechargeOrderInfoList(RechargeOrderInfoExportReqVO exportReqVO);
List<RechargeOrderInfoDO> getRechargeOrderInfoList(List<String> ids);
List<RechargeOrderInfoExcelVO> getRechargeOrderInfoListExcel(List<Long> ids);
}

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderInfoServiceImpl.java
View File

@ -81,8 +81,8 @@ public class RechargeOrderInfoServiceImpl implements RechargeOrderInfoService {
}
@Override
public List<RechargeOrderInfoDO> getRechargeOrderInfoList(List<String> s) {
return rechargeOrderInfoMapper.selectList(s);
public List<RechargeOrderInfoExcelVO> getRechargeOrderInfoListExcel(List<Long> s) {
return rechargeOrderInfoMapper.getRechargeOrderInfoListExcel(s);
}
}

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java
View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.shop.response.member.MemberHeadResponse;
import org.apache.ibatis.annotations.Param;
/**
* 订单 Service 接口
@ -20,7 +21,7 @@ public interface RechargeOrderService {
* @param createReqVO 创建信息
* @return 编号
*/
Integer createRechargeOrder(@Valid RechargeOrderCreateReqVO createReqVO);
Long createRechargeOrder(@Valid RechargeOrderCreateReqVO createReqVO);
/**
* 更新订单
@ -68,6 +69,8 @@ public interface RechargeOrderService {
*/
List<RechargeOrderDO> getRechargeOrderList(RechargeOrderExportReqVO exportReqVO);
List<RechargeOrderExcelVO> findListExcel(RechargeOrderExportReqVO data);
List<RechargeOrderRespVO> memberOrderInfo();
MemberHeadResponse memberHeadInfo();

7
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -45,7 +45,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
private RechargeOrderInfoMapper infoMapper;
@Override
public Integer createRechargeOrder(RechargeOrderCreateReqVO createReqVO) {
public Long createRechargeOrder(RechargeOrderCreateReqVO createReqVO) {
// 插入
RechargeOrderDO rechargeOrder = RechargeOrderConvert.INSTANCE.convert(createReqVO);
rechargeOrderMapper.insert(rechargeOrder);
@ -98,6 +98,11 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
return rechargeOrderMapper.selectList(exportReqVO);
}
@Override
public List<RechargeOrderExcelVO> findListExcel(RechargeOrderExportReqVO data) {
return rechargeOrderMapper.findListExcel(data);
}
@Override
public List<RechargeOrderRespVO> memberOrderInfo() {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();

29
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderInfoMapper.xml
View File

@ -9,4 +9,33 @@
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
<select id="getRechargeOrderInfoListExcel" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderInfoExcelVO">
select
a.order_id as 'orderNo',
e.name as tenantName,
f.product_name as 'productName',
f.price,
f.price as proTotalPrice,
f.price as payPrice,
a.refund_status as afterStatus,
f.price as refundPrice,
a.uid as 'vipAccount',
a.real_name as vipName
from cy_recharge_order_info f
left join cy_recharge_order a on a.id = f.recharge_order_id
left join member_user b on a.promoter_id = b.id
left join system_dept d on d.id = a.dept_id
left join system_tenant e on a.promoter_id = b.id
<where>
<if test="ids!=null and ids.size>0">
f.recharge_order_id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
</select>
</mapper>

89
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -22,6 +22,8 @@
a.user_phone,
a.confirm_phone,
a.pay_type,
a.total_price,
a.pay_price,
a.paid,
d.parent_organization_name
from cy_recharge_order a
@ -33,11 +35,14 @@
<if test="data.orderId !=null and data.orderId!=''">
and a.order_id like CONCAT('%',#{data.orderId},'%')
</if>
<if test="data.payserialNumber !=null and data.payserialNumber!=''">
and a.pay_serial_number like CONCAT('%',#{data.payserialNumber},'%')
<if test="data.tenantId !=null and data.tenantId!=1">
and a.tenant_id =#{data.tenantId}
</if>
<if test="data.paySerialNumber !=null and data.paySerialNumber!=''">
and a.pay_serial_number like CONCAT('%',#{data.paySerialNumber},'%')
</if>
<if test="data.nickname !=null and data.nickname!=''">
and a.nickname like CONCAT('%',#{data.nickname},'%')
and b.nickname like CONCAT('%',#{data.nickname},'%')
</if>
<if test="data.realName !=null and data.realName!=''">
and a.real_name like CONCAT('%',#{data.realName},'%')
@ -53,4 +58,82 @@
</if>
</where>
</select>
<select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
select
a.order_id,
a.pay_serial_number,
a.out_trade_no,
a.pay_time,
b.nickname,
a.real_name,
a.uid,
a.user_phone,
a.confirm_phone,
a.pay_type,
a.total_price,
a.pay_price,
a.paid,
d.parent_organization_name
from cy_recharge_order a
left join member_user b on a.promoter_id = b.id
left join member_promoter c on a.promoter_id=c.user_id
left join system_dept d on d.id = c.dept_id
<include refid="baseWhere">
</include>
</select>
<select id="findListExcel" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderExcelVO">
select
a.id,
a.order_id,
a.pay_serial_number,
e.name as tenantName,
a.pay_time,
a.pay_time as payCompleteTime,
a.real_name,
a.user_phone,
a.confirm_phone,
a.pay_type,
a.total_price,
a.pay_price,
a.uid,
a.real_name as vipName,
a.out_trade_no,
b.nickname as promoter,
d.parent_organization_name as 'depName'
from cy_recharge_order a
left join member_user b on a.promoter_id = b.id
left join system_dept d on d.id = a.dept_id
left join system_tenant e on a.promoter_id = b.id
<include refid="baseWhere">
</include>
</select>
<sql id="baseWhere">
<where>
and a.paid=1
<if test="data.orderId !=null and data.orderId!=''">
and a.order_id like CONCAT('%',#{data.orderId},'%')
</if>
<if test="data.tenantId !=null and data.tenantId!=1">
and a.tenant_id =#{data.tenantId}
</if>
<if test="data.paySerialNumber !=null and data.paySerialNumber!=''">
and a.pay_serial_number like CONCAT('%',#{data.paySerialNumber},'%')
</if>
<if test="data.nickname !=null and data.nickname!=''">
and b.nickname like CONCAT('%',#{data.nickname},'%')
</if>
<if test="data.realName !=null and data.realName!=''">
and a.real_name like CONCAT('%',#{data.realName},'%')
</if>
<if test="data.userPhone !=null and data.userPhone!=''">
and a.user_phone like CONCAT('%',#{data.userPhone},'%')
</if>
<if test="data.payTime !=null ">
and a.pay_time &gt;=#{data.payTime[0]}
</if>
<if test="data.payTime !=null ">
and a.pay_time &lt;=#{data.payTime[1]}
</if>
</where>
</sql>
</mapper>

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
View File

@ -108,11 +108,15 @@ public class MemberUserApiImpl implements MemberUserApi {
}
@Override
@TenantIgnore
public PromoterDTO getPromoterDOByUserId(Long userId) {
PromoterDTO promoterDTO = new PromoterDTO();
PromoterDO promoterDO = promoterService.getPromoterDOByUserId(userId);
promoterDTO.setDeptId(promoterDO.getDeptId());
promoterDO.setId(promoterDO.getId());
if(promoterDO != null){
promoterDTO.setDeptId(promoterDO.getDeptId());
promoterDO.setId(promoterDO.getId());
return promoterDTO;
}
return promoterDTO;
}

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java
View File

@ -13,6 +13,9 @@ public class PromoterRespVO extends PromoterBaseVO {
private Long id;
@Schema(description = "组织名称", required = true, example = "18443")
private String orgName;
@Schema(description = "组织名称", required = true, example = "18443")
@Schema(description = "用户id", required = true, example = "18443")
private String userId;
@Schema(description = "组织简称", required = true, example = "18443")
private String deptName;
}

4
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO;
import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoReqVO;
import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoRespVO;
import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserUpdateMobileReqVO;
@ -76,6 +77,9 @@ public class AppUserController {
AppUserInfoRespVO appUserInfoRespVO = UserConvert.INSTANCE.convert(user);
if(promoterService.checkIsPromoterByUserId(getLoginUserId())){
appUserInfoRespVO.setUserType(UserTypeEnum.PROMOTER);
PromoterRespVO promoterRespVO = promoterService.getPromoterInfo(getLoginUserId());
appUserInfoRespVO.setDeptName(promoterRespVO.getDeptName());
appUserInfoRespVO.setParentDeptName(promoterRespVO.getOrgName());
}else{
appUserInfoRespVO.setUserType(UserTypeEnum.MEMBER);
}

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoRespVO.java
View File

@ -12,6 +12,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class AppUserInfoRespVO {
@Schema(description = "用户id", required = true, example = "芋艿")
private Long userId;
@Schema(description = "用户昵称", required = true, example = "芋艿")
private String nickname;
@ -23,4 +25,10 @@ public class AppUserInfoRespVO {
@Schema(description = "用户类型", required = true, example = "15601691300")
private UserTypeEnum userType;
@Schema(description = "组织", required = true, example = "15601691300")
private String deptName;
@Schema(description = "组织全称", required = true, example = "15601691300")
private String parentDeptName;
}

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.dal.dataobject.user;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -29,7 +30,7 @@ public class MemberUserDO extends TenantBaseDO {
/**
* 用户ID
*/
@TableId
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 用户昵称

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/promoter/PromoterMapper.java
View File

@ -25,6 +25,9 @@ public interface PromoterMapper extends BaseMapperX<PromoterDO> {
.orderByDesc(PromoterDO::getId));
}
IPage<PromoterRespVO> findListPage(IPage<PromoterRespVO> page, @Param("data") PromoterPageReqVO data);
PromoterRespVO getPromoterInfo(@Param("userId") Long userId);
default List<PromoterDO> selectList(PromoterExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PromoterDO>()
.eqIfPresent(PromoterDO::getDeptId, reqVO.getDeptId())

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
View File

@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.member.controller.app.auth.vo.*;
import cn.iocoder.yudao.module.member.convert.auth.AuthConvert;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
import cn.iocoder.yudao.module.member.service.promoter.PromoterService;
import cn.iocoder.yudao.module.member.service.user.MemberUserService;
import cn.iocoder.yudao.module.system.api.logger.LoginLogApi;
import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO;
@ -39,6 +40,7 @@ import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
/**
@ -69,6 +71,9 @@ public class MemberAuthServiceImpl implements MemberAuthService {
@Resource
private MemberUserMapper userMapper;
@Resource
private PromoterService promoterService;
@Override
public AppAuthLoginRespVO login(AppAuthLoginReqVO reqVO) {
// 使用手机 + 密码，进行登录。

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java
View File

@ -77,6 +77,8 @@ public interface PromoterService {
*/
List<PromoterDO> getPromoterList(PromoterExportReqVO exportReqVO);
PromoterRespVO getPromoterInfo(Long userId);
/**
* 批量导入推广员列表
*
@ -85,6 +87,5 @@ public interface PromoterService {
* @return 导入结果
*/
PromoterImportRespVO importUserList(List<PromoterImportExcelVO> importUsers, boolean isUpdateSupport);
PromoterDO getPromoterDOByUserId(Long userId);
}

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
View File

@ -161,6 +161,11 @@ public class PromoterServiceImpl implements PromoterService {
return promoterMapper.selectList(exportReqVO);
}
@Override
public PromoterRespVO getPromoterInfo(Long userId) {
return promoterMapper.getPromoterInfo(userId);
}
/**
* 批量导入推广员列表
*

10
yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
View File

@ -29,4 +29,14 @@
</where>
</select>
<select id="getPromoterInfo" resultType="cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO">
select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',c.name as 'deptName' from member_promoter a
left join member_user b on a.user_id = b.id
left join system_dept c on c.id=a.dept_id
<where>
a.user_id=#{userId}
</where>
</select>
</mapper>

4
yudao-module-system/yudao-module-system-biz/pom.xml
View File

@ -115,6 +115,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>wx-java-mp-spring-boot-starter</artifactId>
</dependency>
</dependencies>
</project>

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
View File

@ -9,9 +9,9 @@ import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*;
import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
import cn.iocoder.yudao.module.system.service.tenant.TenantService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -22,7 +22,6 @@ import javax.validation.Valid;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -36,6 +35,7 @@ public class TenantController {
@Resource
private TenantService tenantService;
@GetMapping("/get-id-by-name")
@PermitAll
@Operation(summary = "使用租户名，获得租户编号", description = "登录界面，根据用户的租户名，获得租户编号")
@ -108,6 +108,4 @@ public class TenantController {
List<TenantExcelVO> datas = TenantConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "租户.xls", "数据", TenantExcelVO.class, datas);
}
}

8
yudao-server/src/main/resources/application.yaml
View File

@ -220,11 +220,11 @@ yudao:
- eb_express
- eb_store_order_status
sms-code: # 短信验证码相关的配置项
expire-times: 10m
send-frequency: 1m
expire-times: 5m
send-frequency: 10m
send-maximum-quantity-per-day: 10
begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
end-code: 9999 # 这里配置 9999 的原因是，测试方便。
begin-code: 100000 # 这里配置 9999 的原因是，测试方便。
end-code: 999999 # 这里配置 9999 的原因是，测试方便。
trade:
order:
app-id: 1 # 商户编号

6
yudao-ui-admin/src/views/shop/rechargeGear/index.vue
View File

@ -31,6 +31,8 @@
<el-table-column label="档位名称" align="center" prop="name" />
<el-table-column label="档位备注" align="center" prop="gearRemarks" />
<el-table-column label="档位显示金额" align="center" prop="gearAmount" />
<el-table-column label="返费金额" align="center" prop="refundAmount" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@ -58,6 +60,9 @@
<el-form-item label="显示金额" prop="gearAmount">
<el-input v-model="form.gearAmount" placeholder="请输入显示金额" />
</el-form-item>
<el-form-item label="返费金额" prop="refundAmount">
<el-input v-model="form.refundAmount" placeholder="请输入返费金额" />
</el-form-item>
<el-form-item label="备注" prop="gearRemarks">
<el-input v-model="form.gearRemarks" placeholder="请输入备注" />
</el-form-item>
@ -107,6 +112,7 @@ export default {
name: [{ required: true, message: "档位名称不能为空", trigger: "blur" }],
gearRemarks: [{ required: true, message: "档位备注不能为空", trigger: "blur" }],
gearAmount: [{ required: true, message: "档位显示金额不能为空", trigger: "blur" }],
refundAmount: [{ required: true, message: "档位显示金额不能为空", trigger: "blur" }],
}
};
},

8
yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="订单编号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
@ -45,7 +45,11 @@
<el-table v-loading="loading" :data="list">
<el-table-column label="订单编号" align="center" prop="orderId" />
<el-table-column label="交易流水号" align="center" prop="paySerialNumber" />
<el-table-column label="订单支付时间" align="center" prop="payTime" width="180"/>
<el-table-column label="订单支付时间" align="center" prop="payTime" width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
<el-table-column label="推广员" align="center" prop="parentOrganizationName" >
<template v-slot="scope">
<span>{{ scope.row.parentOrganizationName }}-{{ scope.row.nickname }}</span>

17
yudao-ui-app/App.vue
View File

@ -31,15 +31,14 @@
id: 0
},
onLaunch: function(option) {
const res = memberGradeInfo().then((res) =>{
if(res.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
index: 2,
text: 'text',
pagePath: '/pages/member_equity/index'
})
}
})
// const res = memberGradeInfo().then((res) =>{
// if(res.data.some((item) => !!parseInt(item.isExist))){
// uni.setTabBarItem({
// index: 2,
// pagePath: '/pages/member_equity/index'
// })
// }
// })
let that = this;
// #ifdef H5

7
yudao-ui-app/components/paymentMember/index.vue
View File

@ -88,9 +88,10 @@
},
function(res) {
if (res.err_msg == "get_brand_wcpay_request:ok") {
uni.switchTab({
url: '/pages/member_application/index'
})
window.location.reload()
// uni.switchTab({
// url: '/pages/member_application/index'
// })
}
})
}

18
yudao-ui-app/pages/member_application/index.vue
View File

@ -101,6 +101,15 @@
},
async onLoad() {
const res = await memberGradeInfo()
if(res.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
index: 2,
pagePath: '/pages/member_equity/index'
})
uni.switchTab({
url:'/pages/member_equity/index'
})
}
this.memberData = res.data
},
methods: {
@ -235,13 +244,12 @@
.box-title {
position: absolute;
top: -5.5%;
top: -37rpx;
left: -203rpx;
margin-left: 50%;
image {
width: 406rpx;
height: 87rpx;
height: 88rpx;
position: relative;
display: flex;
align-items: center;
@ -399,13 +407,13 @@
.box-title {
position: absolute;
top: -9%;
top: -37rpx;
left: -203rpx;
margin-left: 50%;
image {
width: 406rpx;
height: 87rpx;
height: 88rpx;
position: relative;
display: flex;
align-items: center;

2
yudao-ui-app/pages/member_equity/index.vue
View File

@ -141,7 +141,7 @@
background-repeat: no-repeat;
background-attachment: fixed;
.box-member {
padding: 36rpx 40rpx;

4
yudao-ui-app/pages/member_others/index.vue
View File

@ -247,13 +247,13 @@
.box-title {
position: absolute;
top: -5.5%;
top: -37rpx;
left: -203rpx;
margin-left: 50%;
image {
width: 406rpx;
height: 87rpx;
height: 88rpx;
position: relative;
display: flex;
align-items: center;

1
yudao-ui-app/pages/member_record/index.vue
View File

@ -44,7 +44,6 @@
}
})
this.memberData = arr
console.log(this.memberData)
},
watch:{
keyword :Debounce (function (){

4
yudao-ui-app/pages/member_renew/index.vue
View File

@ -223,13 +223,13 @@ import store from '@/store/index';
.box-title {
position: absolute;
top: -5.5%;
top: -37rpx;
left: -203rpx;
margin-left: 50%;
image {
width: 406rpx;
height: 87rpx;
height: 88rpx;
position: relative;
display: flex;
align-items: center;