From c26b5587a09499797b65f353db7775a6db150ed2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 14:13:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java | 5 +++++
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java | 8 ++++----
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 4 ++--
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 4 ++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 1 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/CouponInfoMapper.java | 3 ++-
9 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 1f101d7..e7e9226 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -58,7 +58,7 @@
@PostMapping("/app-user/getVipCount")
R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );
- @GetMapping("/getAppUserByPhone")
- public R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
+ @GetMapping("/app-user/getAppUserByPhone")
+ R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
index 18a0e1d..67f81a7 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
@@ -11,6 +11,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
index 5818bc6..aa4ac8c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
@@ -57,6 +57,11 @@
public R<Order> getLastOrder(Long appUserId) {
return R.fail("获取订单失败");
}
+
+ @Override
+ public R<List<Order>> byUserId(Long appUserId) {
+ return R.fail();
+ }
};
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
index 59cc054..c6ccb84 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
@@ -86,12 +86,12 @@
@ApiModelProperty(value = "有效期开始时间")
@TableField("period_start_time")
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate periodStartTime;
+ private LocalDateTime periodStartTime;
@ApiModelProperty(value = "有效期结束时间")
@TableField("period_end_time")
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate periodEndTime;
+ private LocalDateTime periodEndTime;
@ApiModelProperty(value = "领取后x天有效")
@TableField("period_days")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
index 799df1d..07fc02d 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
@@ -52,6 +52,10 @@
@TableField("vip_withdrawal_role")
private Integer vipWithdrawalRole;
+ @ApiModelProperty(value = "钱包提现权限:1开0关")
+ @TableField("vip_agent_level_up_role")
+ private Integer vipAgentLevelUpRole;
+
@ApiModelProperty(value = "最低提现门槛")
@TableField("vip_withdrawal_min_amount")
private BigDecimal vipWithdrawalMinAmount;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
index d918033..c0fe645 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
@@ -58,8 +58,8 @@
@GetMapping("/getSysPhone")
@ApiOperation(value = "获取客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R<Phone> getSysPhone(){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
LambdaQueryWrapper<Phone> wrapper = new LambdaQueryWrapper<>();
if(sysUser.getRoleType() == 1){
wrapper.eq(Phone::getType, 1);
@@ -75,8 +75,8 @@
@PostMapping("/savePhone")
@ApiOperation(value = "保存客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R savePhone(@RequestBody Phone phone){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
//平台配置
if(sysUser.getRoleType() == 1){
Phone one = phoneService.getOne(new LambdaQueryWrapper<Phone>().eq(Phone::getType, 1));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 7aa69f8..ecb2180 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -80,7 +80,7 @@
shop.setCustomOrderNumber(0);
shopService.save(shop);
- LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ LoginUser loginUserApplet = tokenService.getLoginUser();
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(loginUserApplet.getUserid());
appUserShop.setShopId(shop.getId());
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/CouponInfoMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/CouponInfoMapper.java
index 90b27a0..c8626d8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/CouponInfoMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/CouponInfoMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.other.api.domain.CouponInfo;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,5 +14,5 @@
* @since 2024-11-20
*/
public interface CouponInfoMapper extends BaseMapper<CouponInfo> {
- IPage<CouponInfo> queryCouponInfoPage(IPage<CouponInfo> page, CouponInfo couponInfo);
+ IPage<CouponInfo> queryCouponInfoPage(@Param("page") IPage<CouponInfo> page, @Param("couponInfo") CouponInfo couponInfo);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml
index 4c34d60..59d9526 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml
@@ -35,8 +35,8 @@
<if test="couponInfo.couponType != null">
AND tci.coupon_type = #{couponInfo.couponType}
</if>
- <if test="couponInfo.send_type != null">
- AND tci.send_type = #{couponInfo.send_type}
+ <if test="couponInfo.sendType != null">
+ AND tci.send_type = #{couponInfo.sendType}
</if>
<if test="couponInfo.personType != null">
AND tci.person_type = #{couponInfo.personType}
--
Gitblit v1.7.1