Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!709

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -349,7 +349,7 @@ public class TicketBoxMgrController extends BaseApiController {
 				return AjaxResult.error("导入失败，请联系管理员");
 			}
 			return AjaxResult.success("导入成功， 导入数据条数："+successNum);
-			// 数据处理 TODO
+			// 数据处理
 		} catch (Exception e) {
 			return AjaxResult.error("导入失败，请联系管理员");
 		}

mp-admin/src/main/java/com/qs/mp/web/controller/api/callback/PayCallBackController.java

@@ -68,7 +68,6 @@ public class PayCallBackController {
     //回调金额与订单金额一致性校验
     PayOrder order = payOrderService.getById(shopOrderNo);
     if(order.getTransactionAmount() != payMoney){
-      //Todo 告警
       logger.error("回调金额与订单金额不一致");
       responseWrite(response,"error");
       return;

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -64,7 +64,7 @@ public class ChannelTicketController extends BaseApiController {
           @ApiResponse(code = 200, message = "success", response = TicketBoxListVO.class)
   )
   public TableDataInfo list(@RequestBody TicketBoxParam param) {
-    // TODO 根据标签过滤
+
 
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Channel channel = channelService.getById(channelId);

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -101,7 +101,7 @@ public class UserTicketController extends BaseApiController {
   @PostMapping("/mall/ticket/list")
   @ApiOperation(value = "盲票组列表", notes = "获取所有盲票信息")
   public TableDataInfo list(@RequestBody TicketBoxParam param) {
-    // TODO 根据标签过滤
+
     startPage();
     List<TicketBox> ticketBoxes = ticketBoxService.list(
         new LambdaQueryWrapper<TicketBox>().eq(TicketBox::getType, param.getType())

mp-common/src/main/java/com/qs/mp/common/utils/LogUtil.java

@@ -199,7 +199,7 @@ public class LogUtil {
             }
         }
         if(ServerEnvEnum.PROD.getCode().equals(env)){
-            // TODO
+
 //            DingService.sendAlertDing(getLogString(message, params) + "/n" + throwable);
         }
 

mp-framework/src/main/java/com/qs/mp/framework/monitor/SendErrorMsgAppender.java

@@ -31,6 +31,7 @@ public class SendErrorMsgAppender extends UnsynchronizedAppenderBase<ILoggingEve
         || throwableMsg.startsWith("盲票已付款，") || throwableMsg.startsWith("盲票已兑奖") || throwableMsg.startsWith("登录用户不存在：")
         || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效") || throwableMsg.startsWith("您已经助力过了")
         || throwableMsg.startsWith("您已经获取过抽奖码了") || throwableMsg.startsWith("奖品总数值不相同") || throwableMsg.startsWith("包含已兑奖记录的奖品不能从奖级中删除")
+        || throwableMsg.startsWith("登录账号不存在")
         )) {
           return;
         }

mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponServiceImpl.java

@@ -173,7 +173,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 					couponTicket.setCouponId(couponTicket.getCouponId());
 				}
 			}
-			// TODO 未完待续
+
 			LambdaQueryWrapper<CouponTicket> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(CouponTicket::getCouponId, coupon.getCouponId());
 			boolean delRes = couponTicketService.remove(queryWrapper);

mp-service/src/main/java/com/qs/mp/user/service/impl/UserCouponServiceImpl.java

@@ -112,7 +112,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
             .le("t1.valid_start", DateUtils.getToday()).ge("t1.valid_end", DateUtils.getToday())
             .le("t2.min_order_amt", orderAmt)
             .le("t2.discount", orderAmt)
-            .orderByDesc("t2.discount"));
+            .orderByDesc("t2.discount","t1.id"));
     return userCouponVOList;
   }
 }