java/DolphinEnglish.git

			@@ -98,6 +98,10 @@
			wrapper.eq("typeIds",substring);
			}
			wrapper.eq("isDelete", 0);
			// sort排序
			wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
			.orderByAsc("sort")
			.orderByDesc("createTime");
			return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
			}

			@@ -123,7 +127,10 @@
			wrapper.eq("typeIds",substring);
			}
			wrapper.eq("isDelete", 0);
			wrapper.orderByAsc("sort");
			// sort排序
			wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
			.orderByAsc("sort")
			.orderByDesc("createTime");
			return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
			}

			@@ -770,6 +777,13 @@
			.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
			.eq(Recipient::getIsDefault, 1)
			.eq(Recipient::getDisabled, 0).one();
			if (null == recipient) {
			recipient = recipientService.lambdaQuery()
			.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
			.eq(Recipient::getDisabled, 0)
			.orderByDesc(Recipient::getCreateTime)
			.last("limit 1").one();
			}
			GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
			LocalDateTime currentDateTime = LocalDateTime.now();
			// 格式化日期和时间信息
			@@ -806,12 +820,11 @@
			.eq(Recipient::getIsDefault, 1).one();
			if (recipient == null) {
			// 随便取一条地址数据
			List<Recipient> list = recipientService.lambdaQuery()
			recipient = recipientService.lambdaQuery()
			.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
			.list();
			if (!list.isEmpty()) {
			recipient = list.get(0);
			}
			.orderByDesc(Recipient::getCreateTime)
			.eq(Recipient::getDisabled, 0).last("limit 1")
			.one();
			}
			GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
			LocalDateTime currentDateTime = LocalDateTime.now();