zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-12-12 09:07:02 +08:00
parent 0ac6ab33d5 b950d03dae
commit 0865cd5290
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
View File

@@ -251,7 +251,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()+"赠送");
}
}

1
src/main/java/com/peanut/modules/medical/controller/MedicalLabelAndMarketController.java
View File

@@ -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);

1
src/main/java/com/peanut/modules/sys/controller/VisitorController.java
View File

@@ -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);