diff --git a/src/main/java/org/springblade/common/enums/ErrorMsgEnum.java b/src/main/java/org/springblade/common/enums/ErrorMsgEnum.java new file mode 100644 index 0000000..6b4d6ea --- /dev/null +++ b/src/main/java/org/springblade/common/enums/ErrorMsgEnum.java @@ -0,0 +1,48 @@ +package org.springblade.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author liuqk + * @version 1.0 + * @date 2023-08-21 13:16 + */ +@Getter +@AllArgsConstructor +public enum ErrorMsgEnum { + ERROR_MSG_ORDER_SAVE_FAILED(1000, "新建订单失败."), + ERROR_MSG_ORDER_HAS_UNPAID(1001, "您当前有未付款的清单, 请支付."), + ERROR_MSG_ORDER_ADDRESS_CANNOT_EDIT(1002, "只允许未付款和未发货状态的订单进行地址修改."), + ; + + final Integer code; + final String name; + + /** + * 匹配枚举值 + * + * @param name 名称 + * @return PillowHardnessEnum + */ + public static SleepingPostureEnum of(String name) { + if (name == null) { + return null; + } + for (SleepingPostureEnum smsEnum : SleepingPostureEnum.values()) { + if (smsEnum.name.equals(name)) { + return smsEnum; + } + } + return null; + } + + public static String getName(Integer code) { + for (SleepingPostureEnum value : SleepingPostureEnum.values()) { + if (value.getCode() == code) { + return value.getName(); + } + } + return ""; + } +} diff --git a/src/main/java/org/springblade/modules/desk/controller/OrderController.java b/src/main/java/org/springblade/modules/desk/controller/OrderController.java index 24dbe2a..cb2aa6f 100644 --- a/src/main/java/org/springblade/modules/desk/controller/OrderController.java +++ b/src/main/java/org/springblade/modules/desk/controller/OrderController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.cache.DictBizCache; @@ -104,22 +105,22 @@ public class OrderController { .eq(Order::getBuyerPhone, info.getBuyerPhone()) .eq(Order::getStatus, OrderStatusEnum.ORDER_STATUS_UNPAID.getCode())); if (Func.isNotEmpty(orderCheck)) { - return R.fail("您当前有未付款的清单, 请支付."); + return R.fail(ErrorMsgEnum.ERROR_MSG_ORDER_HAS_UNPAID.getCode(), ErrorMsgEnum.ERROR_MSG_ORDER_HAS_UNPAID.getName()); } // 生成订单号, 年月日+4位自增 info.setOrderNo(DateUtil.format(DateUtil.now(), "yyyyMMddHH") + orderService.getAutoIncreSerialNumber()); String goodsName = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME); - String price = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME); info.setGoodsName(goodsName); - info.setGoodsPrice(Func.toDouble(price)); info.setGoodsNum(1); + String price = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME); + info.setGoodsPrice(Func.toDouble(price)); if (orderService.save(info)) { return R.data(info); } else { - return R.fail("新建订单失败"); + return R.fail(ErrorMsgEnum.ERROR_MSG_ORDER_SAVE_FAILED.getCode(), ErrorMsgEnum.ERROR_MSG_ORDER_SAVE_FAILED.getName()); } } @@ -145,7 +146,7 @@ public class OrderController { return R.status(orderService.update(null, lambdaUpdateWrapper)); } else { - return R.fail("只允许未付款和未发货状态的订单进行地址修改"); + return R.fail(ErrorMsgEnum.ERROR_MSG_ORDER_ADDRESS_CANNOT_EDIT.getCode(), ErrorMsgEnum.ERROR_MSG_ORDER_ADDRESS_CANNOT_EDIT.getName()); } } diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java index c6f3faa..e5ca701 100644 --- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java +++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java @@ -273,7 +273,7 @@ public class DictBizController extends BladeController { updateName .eq(DictBiz::getCode, DictConstant.GOODS_INFO) .eq(DictBiz::getDictKey, DictConstant.GOODS_INFO_KEY_NAME) - .set(DictBiz::getDictValue, price) + .set(DictBiz::getDictValue, goodsName) ; LambdaUpdateWrapper updatePrice = new LambdaUpdateWrapper<>(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8e5cf3e..58a9873 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -190,6 +190,7 @@ blade: - /blade-system/dict-biz/get-purchase-channel - /blade-system/dict-biz/get-goods-info - /app/login + - /app/phone - /weChatUser/save - /weChatUser/getWeChatUser #授权认证配置