diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index 7d42e78d..88fff372 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -83,7 +83,7 @@ public interface ErrorCodeConstants { ErrorCode ORDER_ALREADY_COMPLETE = new ErrorCode(1_004_099_004, "餐盘未绑定"); ErrorCode FACE_NOT_BIND_USER = new ErrorCode(1_004_099_005, "人脸未绑定"); ErrorCode CARD_NOT_BIND_USER = new ErrorCode(1_004_099_006, "该卡未绑定用户"); - ErrorCode INSUFFICIENT_BALANCE = new ErrorCode(1_004_099_007, "余额不足10元,请充值"); + ErrorCode INSUFFICIENT_BALANCE = new ErrorCode(1_004_099_007, "余额不足,请充值"); ErrorCode INSUFFICIENT_BALANCE_NEW = new ErrorCode(1_004_099_007, "余额不足,非工作日只能使用微信余额"); ErrorCode EXIST_TO_COMPLETE_ORDER = new ErrorCode(1_004_099_008, "存在未支付完的订单"); ErrorCode CARD_ALREADY_BIND = new ErrorCode(1_004_099_008, "卡号已绑定"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/wxstoreorderdetail/WxStoreOrderDetailController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/wxstoreorderdetail/WxStoreOrderDetailController.java index d84d01a6..326c7e9a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/wxstoreorderdetail/WxStoreOrderDetailController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/wxstoreorderdetail/WxStoreOrderDetailController.java @@ -71,6 +71,15 @@ public class WxStoreOrderDetailController { return success(BeanUtils.toBean(wxStoreOrderDetail, WxStoreOrderDetailRespVO.class)); } + @GetMapping("/getByOrderId") + @Operation(summary = "获得微信付款码订单详情") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult> getWxStoreOrderDetailByOrderId(@RequestParam("orderId") Long orderId) { + List wxStoreOrderDetailByOrderId = wxStoreOrderDetailService.getWxStoreOrderDetailByOrderId(orderId); + return success(BeanUtils.toBean(wxStoreOrderDetailByOrderId, WxStoreOrderDetailRespVO.class)); + } + + @GetMapping("/page") @Operation(summary = "获得微信付款码订单详情分页") @PreAuthorize("@ss.hasPermission('member:wx-store-order-detail:query')") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java index dcb8668b..c6162049 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java @@ -374,7 +374,11 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { cashAmount = BigDecimal.ZERO; } BigDecimal money = memberUserDO.getWxAmount().add(cashAmount); - if (money.compareTo(MemberConstants.ALARM_BALANCE) < 0) { + BigDecimal compareMoney = MemberConstants.ALARM_BALANCE; + if(storeId .equals(MemberConstants.SANXIA_ROAD_COMMUNITY)){ + compareMoney = MemberConstants.SANXIA_ROAD_COMMUNITY_BALANCE; + } + if (money.compareTo(compareMoney) < 0) { if(typeHoliday){ throw exception(INSUFFICIENT_BALANCE_NEW); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorder/WxStoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorder/WxStoreOrderServiceImpl.java index 1ac07502..1f32b821 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorder/WxStoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorder/WxStoreOrderServiceImpl.java @@ -117,7 +117,7 @@ public class WxStoreOrderServiceImpl implements WxStoreOrderService { if(b){ WxStoreOrderDO wxStoreOrderDO = new WxStoreOrderDO(); wxStoreOrderDO.setOutTradeNo(outTradeNo); - wxStoreOrderDO.setTotalPrice(vo.getTotalPrice()); + wxStoreOrderDO.setTotalPrice(totalPrice); wxStoreOrderDO.setAuthCode(vo.getAuthCode()); wxStoreOrderDO.setCarteenId(vo.getCarteenId()); wxStoreOrderDO.setStatus("SUCCESS"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailService.java index ced87580..d91e18a7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailService.java @@ -44,6 +44,8 @@ public interface WxStoreOrderDetailService { */ WxStoreOrderDetailDO getWxStoreOrderDetail(Long id); + List getWxStoreOrderDetailByOrderId(Long orderId); + /** * 获得微信付款码订单详情分页 * diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailServiceImpl.java index 6145ce08..0c2277c4 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/wxstoreorderdetail/WxStoreOrderDetailServiceImpl.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.member.service.wxstoreorderdetail; +import cn.hutool.core.collection.CollectionUtil; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -66,6 +69,11 @@ public class WxStoreOrderDetailServiceImpl implements WxStoreOrderDetailService return wxStoreOrderDetailMapper.selectById(id); } + @Override + public List getWxStoreOrderDetailByOrderId(Long orderId) { + return wxStoreOrderDetailMapper.selectList(new LambdaQueryWrapperX().eq(WxStoreOrderDetailDO::getWxOrderId, orderId)); + } + @Override public PageResult getWxStoreOrderDetailPage(WxStoreOrderDetailPageReqVO pageReqVO) { return wxStoreOrderDetailMapper.selectPage(pageReqVO); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java index bf74be93..966e7842 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java @@ -83,4 +83,14 @@ public class MemberConstants { * 晚餐推荐摄入量 */ public static final BigDecimal PROPOSE_NIGHT = new BigDecimal("600"); + + /** + * 社区门店ID + */ + public static final Long SANXIA_ROAD_COMMUNITY = 1038L; + + /** + * 社区门店ID + */ + public static final BigDecimal SANXIA_ROAD_COMMUNITY_BALANCE = new BigDecimal("16"); } \ No newline at end of file