新增麦当劳

This commit is contained in:
wulin 2022-04-25 09:15:50 +08:00
parent 0ab9ecb5bf
commit 9b968571f8

View File

@ -62,7 +62,10 @@ public class McdonaldCouponController {
String sha1 = redisCacheUtil.getValue("WEIXIN_TOKEN_" + phone, "");
if(sha1.length() > 0) {
McdonaldCouponDto mcdonaldCouponDto = mcdonaldCouponService.selectMcdonaldCouponByQrCode(code);
return R.ok().put("mcdonaldCoupon", mcdonaldCouponDto);
if(mcdonaldCouponDto != null){
return R.ok().put("mcdonaldCoupon", mcdonaldCouponDto);
}
return R.error(501, "无效优惠券");
}
return R.error("非法访问");
}
@ -73,7 +76,7 @@ public class McdonaldCouponController {
public R setUseByCode(@ApiParam("二维码内容") @RequestParam String code,
@ApiParam("订单金额") @RequestParam BigDecimal orderMoney,
@ApiParam("订单金额") @RequestParam String orderId,
@ApiParam("用户手机号") @RequestParam String phone) {
@ApiParam("麦当劳客服手机号") @RequestParam String phone) {
String sha1 = redisCacheUtil.getValue("WEIXIN_TOKEN_" + phone, "");
if(sha1.length() > 0){
return mcdonaldCouponService.updateMcdonaldCouponByQrCode(code, orderMoney, orderId);