Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 6e00a7394e691883295799dd45f509e8ac57c58d

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -521,7 +521,10 @@
    @GetMapping("/select")
    @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
    public R<AppUser> select(String phone) {
        AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
        AppUser byId = appUserService.lambdaQuery()
                .eq(AppUser::getPhone, phone)
                .eq(AppUser::getDelFlag,0)
                .one();
        if (byId == null) {
            return R.fail("搜索失败，手机号错误。");
        }

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java

@@ -22,6 +22,7 @@
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.PointSettingClient;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -135,12 +136,12 @@
                                     String phone,
                                     Integer id) {

        Long appUserId = null;
        List<Long> appUserIds = null;
        if (!StringUtils.isEmpty(phone)){
            AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
            List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
                    .like(AppUser::getPhone, phone));
            if (appUser1 != null){
                appUserId = appUser1.getId();
            if (!CollectionUtils.isEmpty(appUserList)){
                appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
            }
        }

@@ -148,7 +149,7 @@
                .isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
                .isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
                .eq(UserCoupon::getCouponId, id)
                .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
                .in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
                .lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
        for (UserCoupon record : page.getRecords()) {
            record.setIdStr(record.getId().toString());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -16,8 +16,10 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
@@ -69,6 +71,8 @@
    private OrderMapper orderMapper;
    @Resource
    private SysUserClient sysUserClient;
    @Resource
    private RefundPassService refundPassService;


    /**
@@ -267,6 +271,10 @@
    @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
    public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
        OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
        RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
        if (refundPass!=null){
            orderInfo.setRefundPassId(refundPass.getId().toString());
        }
        return R.ok(orderInfo);
    }
    
@@ -290,7 +298,7 @@
        List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
                .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
                .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
                .orderByDesc(Order::getCreateTime));
                .orderByAsc(Order::getCreateTime));


        Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java

@@ -19,6 +19,7 @@

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
@@ -131,7 +132,8 @@
    public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
        return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
    }
	


    
    @ResponseBody
    @PostMapping("/authPassStatus")

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java

@@ -16,6 +16,8 @@
public class OrderInfoVo {
    @ApiModelProperty("订单id")
    private String id;
    @ApiModelProperty("售后订单id")
    private String refundPassId;
    @ApiModelProperty("订单编号")
    private String orderNumber;
    @ApiModelProperty("下单时间")

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java

@@ -155,6 +155,9 @@
    @ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
    @PostMapping("/manage/edit")
    public R<Void> manageedit(@RequestBody Share share) {
        if (share.getAuditStatus()==2){
            share.setAuditStatus(0);
        }
        shareService.updateById(share);
        return R.ok();
    }