liujie
2023-08-02 b64d67ef01e81a857046f19dd556b4e4f0695e1c
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Site;
import com.dsh.other.entity.SiteBooking;
import com.dsh.other.entity.SiteType;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
import com.dsh.other.feignclient.activity.model.UserCoupon;
import com.dsh.other.feignclient.model.BillingDataRequestVo;
import com.dsh.other.feignclient.model.SiteVo;
import com.dsh.other.model.*;
import com.dsh.other.service.ISiteBookingService;
import com.dsh.other.service.ISiteService;
@@ -300,7 +304,7 @@
                siteBooking.setRefundOrderNo(refund_id);
                siteBookingService.updateById(siteBooking);
                if(null != siteBooking.getUserCouponId()){
                    UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId());
                    UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
                    userCoupon.setStatus(1);
                    userCouponClient.updateUserCoupon(userCoupon);
                }
@@ -356,11 +360,11 @@
    /**
     * 查询所有现金支付的预约记录
     * @param appUserId
     * @param requestVo
     * @return
     */
    @PostMapping("/base/site/queryPaymentSiteDetail")
    public List<SiteBooking> getAllSiteBookingList(@RequestBody Integer appUserId){
    public List<SiteBooking> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
        ArrayList<Integer> integers = new ArrayList<>();
        integers.add(1);
        integers.add(2);
@@ -370,7 +374,8 @@
        return siteBookingService.list(new QueryWrapper<SiteBooking>()
                .in("status",integers)
                .ne("payType",3)
                .eq("appUserId",appUserId));
                .eq("appUserId",requestVo.getAppUserId())
                .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    }
    /**
@@ -393,4 +398,26 @@
    }
    @PostMapping("/base/site/getNewAddSiteList")
    public List<SiteVo> getAppUserSiteList(){
        List<SiteVo> siteVos = new ArrayList<>();
        List<Site> list = siteService.list(new QueryWrapper<Site>()
                .orderByDesc("insertTime"));
        if (list.size() > 0 ){
            for (Site site : list) {
                SiteVo vo = new SiteVo();
                vo.setSiteId(site.getId());
                vo.setSiteName(site.getName());
                vo.setSiteTime(site.getAppointmentStartTime() + "-" + site.getAppointmentEndTime());
                SiteType byId = siteTypeService.getById(site.getSiteTypeId());
                vo.setSiteType(byId.getName());
                vo.setPrice(site.getCashPrice());
                siteVos.add(vo);
            }
        }
        return siteVos;
    }
}