irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix
Some checks failed
Build and Push Backend / docker (push) Failing after 8s
Details

Browse Source
This commit is contained in:
huchuansai
2025-10-05 22:03:32 +08:00
parent 4ee24aabea
commit f64964a39a
12 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java
View File

@@ -85,16 +85,19 @@ public class GlobalExceptionHandler {
@ExceptionHandler(MismatchedInputException.class)
public R mismatchedInputException(MismatchedInputException e) {
log.error("请求参数格式异常", e);
return R.error("请求参数格式异常");
}
@ExceptionHandler(HttpMessageNotReadableException.class)
public R httpMessageNotReadableException(HttpMessageNotReadableException e) {
log.error("请求参数格式异常", e);
return R.error("请求参数格式异常");
}
@ExceptionHandler(MissingServletRequestParameterException.class)
public R missingServletRequestParameterException(MissingServletRequestParameterException e) {
log.error("请求参数格式异常", e);
return R.error("请求参数格式异常");
}

2
play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java
View File

@@ -6,11 +6,9 @@ import com.starry.admin.modules.order.module.dto.*;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.module.vo.*;
import com.starry.admin.modules.weichat.entity.order.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import org.springframework.stereotype.Service;
/**

2
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

@@ -39,7 +39,6 @@ import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.ConvertUtil;
import com.starry.common.utils.IdUtils;
import com.starry.common.utils.StringUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
@@ -50,7 +49,6 @@ import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

16
play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponInfoController.java
View File

@@ -18,10 +18,12 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -60,8 +62,7 @@ public class PlayCouponInfoController {
/**
* 修改优惠券上下架状态
*
* @param vo
* 优惠券上下架对象
* @param vo 优惠券上下架对象
*/
@ApiOperation(value = "更新优惠券上下架状态", notes = "修改优惠券上下架状态")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "更新失败，包含详细错误信息")})
@@ -79,16 +80,17 @@ public class PlayCouponInfoController {
/**
* 发放优惠券
*
* @param vo
* 优惠券发放对象
* @param vo 优惠券发放对象
*/
@ApiOperation(value = "发放优惠券", notes = "向指定用户发放优惠券")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "发放失败，包含详细错误信息")})
@PostMapping("/sendCoupon")
public R sendCoupon(@ApiParam(value = "优惠券发放信息", required = true) @Validated @RequestBody PlayCouponInfoSendVo vo) {
PlayCustomUserInfoEntity customUserInfo = playCustomUserInfoService.selectById(vo.getCustomId());
playCouponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(),
customUserInfo.getLevelId(), vo.getId(), "2", "1");
for (Integer i = 0; i < vo.getSendNumber(); i++) {
playCouponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(),
customUserInfo.getLevelId(), vo.getId(), "2", "1");
}
return R.ok();
}
@@ -161,7 +163,7 @@ public class PlayCouponInfoController {
@Log(title = "优惠券信息", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id,
@ApiParam(value = "优惠券信息", required = true) @RequestBody PlayCouponInfoEntity playCouponInfo) {
@ApiParam(value = "优惠券信息", required = true) @RequestBody PlayCouponInfoEntity playCouponInfo) {
playCouponInfo.setId(id);
boolean success = playCouponInfoService.update(playCouponInfo);
if (success) {

1
play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoSendVo.java
View File

@@ -29,7 +29,6 @@ public class PlayCouponInfoSendVo {
/**
* 优惠券数量不能为空
*/
@Max(value = 1, message = "优惠券数量必须小于1")
@Min(value = 1, message = "优惠券数量必须大于1")
private Integer sendNumber;

5
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
View File

@@ -44,7 +44,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -52,7 +51,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -476,8 +474,7 @@ public class WxClerkController {
public R checkSubscribe() {
String openid = ThreadLocalRequestDetail.getClerkUserInfo().getOpenid();
String tenantId = SecurityUtils.getTenantId();
wxCustomMpService.checkSubscribe(openid, tenantId);
return R.ok(true);
return R.ok(wxCustomMpService.checkSubscribe(openid, tenantId));
}

29
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java
View File

@@ -25,11 +25,13 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -139,18 +141,23 @@ public class WxCouponController {
// 优惠券列表
List<WxCouponOrderReturnVo> couponReturnVos = new ArrayList<>();
for (PlayCouponDetailsReturnVo couponDetails : list) {
PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId());
WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class);
String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo,
vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(),
commodityInfo.getCommodityPrice());
if (StrUtil.isEmpty(couponReasonForUnavailableUse)) {
wxCouponReturnVo.setAvailable("1");
} else {
wxCouponReturnVo.setAvailable("0");
wxCouponReturnVo.setReasonForUnavailableUse(couponReasonForUnavailableUse);
try {
PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId());
WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class);
String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo,
vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(),
commodityInfo.getCommodityPrice());
if (StrUtil.isEmpty(couponReasonForUnavailableUse)) {
wxCouponReturnVo.setAvailable("1");
} else {
wxCouponReturnVo.setAvailable("0");
wxCouponReturnVo.setReasonForUnavailableUse(couponReasonForUnavailableUse);
}
couponReturnVos.add(wxCouponReturnVo);
} catch (Exception e) {
}
couponReturnVos.add(wxCouponReturnVo);
}
return R.ok(couponReturnVos);
}

5
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java
View File

@@ -27,10 +27,8 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.util.Date;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.bean.WxJsapiSignature;
import me.chanjar.weixin.common.error.WxErrorException;
@@ -201,8 +199,7 @@ public class WxOauthController {
public R checkSubscribe() {
String openid = ThreadLocalRequestDetail.getCustomUserInfo().getOpenid();
String tenantId = SecurityUtils.getTenantId();
wxCustomMpService.checkSubscribe(openid, tenantId);
return R.ok(true);
return R.ok(wxCustomMpService.checkSubscribe(openid, tenantId));
}
@ApiOperation(value = "顾客登录回调", notes = "微信顾客授权登录回调处理")

2
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
View File

@@ -33,7 +33,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -43,7 +42,6 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
View File

@@ -22,13 +22,11 @@ import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService
import com.starry.admin.modules.system.module.entity.SysTenantEntity;
import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
import com.starry.admin.utils.SecurityUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java
View File

@@ -14,11 +14,9 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.ConvertUtil;
import com.starry.common.utils.IdUtils;
import java.io.InputStream;
import java.util.Date;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;