From d91aa4c7cef1fecb22fc0256831ef46c11f07acf Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 4 Dec 2024 09:56:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical/controller/MedicalLabelAndMarketController.java      | 1 +
 .../com/peanut/modules/sys/controller/VisitorController.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/peanut/modules/medical/controller/MedicalLabelAndMarketController.java b/src/main/java/com/peanut/modules/medical/controller/MedicalLabelAndMarketController.java
index 36653e77..8086275c 100644
--- a/src/main/java/com/peanut/modules/medical/controller/MedicalLabelAndMarketController.java
+++ b/src/main/java/com/peanut/modules/medical/controller/MedicalLabelAndMarketController.java
@@ -59,6 +59,7 @@ public class MedicalLabelAndMarketController {
         if (params.containsKey("medicineMarketId")&&!"".equals(params.get("medicineMarketId").toString())){
             wrapper.eq(ShopProductToMedicineMarket::getMedicineMarketId,params.get("medicineMarketId").toString());
         }
+        wrapper.orderByAsc(ShopProductToMedicineMarket::getSort);
         Page<ShopProduct> page = productService.page(new Page<>(
                 Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         return R.ok().put("result", page);
diff --git a/src/main/java/com/peanut/modules/sys/controller/VisitorController.java b/src/main/java/com/peanut/modules/sys/controller/VisitorController.java
index 75969919..11cff89e 100644
--- a/src/main/java/com/peanut/modules/sys/controller/VisitorController.java
+++ b/src/main/java/com/peanut/modules/sys/controller/VisitorController.java
@@ -203,6 +203,7 @@ public class VisitorController {
         if (params.containsKey("medicineMarketId")&&!"".equals(params.get("medicineMarketId").toString())){
             wrapper.eq(ShopProductToMedicineMarket::getMedicineMarketId,params.get("medicineMarketId").toString());
         }
+        wrapper.orderByAsc(ShopProductToMedicineMarket::getSort);
         Page<ShopProduct> page = productService.page(new Page<>(
                 Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         return R.ok().put("result", page);

From b950d03daea711e6ba89be2f3542234d36863000 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 6 Dec 2024 14:38:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9userid=E4=BB=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/common/service/impl/CouponServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
index 67c51461..ddc296dc 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
@@ -261,7 +261,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
             ShopProduct shopProduct = shopProductDao.selectById(map.get("product_id").toString());
             for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
                 insertCouponHistory(Integer.parseInt(map.get("coupon_id").toString()),
-                        ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
+                        order.getUserId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
             }
         }