From 693517b9e02eeca237880530bfe6dd63d068d163 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 14 Jul 2025 13:15:03 +0800 Subject: [PATCH] =?UTF-8?q?i=E5=9B=BD=E7=BD=91=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE=20i=E5=9B=BD=E7=BD=91?= =?UTF-8?q?=EF=BC=9A=E9=80=80=E5=8D=95=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/houqin/constant/SourceTypeEnum.java | 1 - .../core/zhhq/controller/ZhhqOrderController.java | 12 ++++++------ .../bonus/canteen/core/zhhq/domain/OrderAddDTO.java | 7 ++----- .../resources/mapper/ims/ImsIntoInventoryMapper.xml | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/SourceTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/SourceTypeEnum.java index 8667c20..bb6913f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/SourceTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/SourceTypeEnum.java @@ -74,7 +74,6 @@ public enum SourceTypeEnum { OUTER_THIRD_MACHINE(101, "外部第三方设备"), CANTEEN_VOICE(102, "收银喇叭(食堂)"), MARKET_VOICE(103, "收银喇叭(商超)"), - YWT_H5_MOBILE(104, "一网通H5"), UNKNOW(999, "未知设备"); private final Integer key; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/controller/ZhhqOrderController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/controller/ZhhqOrderController.java index 142d604..6249e69 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/controller/ZhhqOrderController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/controller/ZhhqOrderController.java @@ -37,9 +37,9 @@ public class ZhhqOrderController extends BaseController { @ApiOperation("消费扣款") @PostMapping({"/payment"}) public AjaxResult payment(@RequestHeader Map requestHeader, @RequestBody @Valid OrderAddDTO dto) { -// if (!(GlobalConstants.JYY + getCurrentDateStr()).equals(Sm4Utils.decrypt(HeaderFetchUtil.getSign(requestHeader)))) { -// throw new ServiceException("访问缺少认证信息"); -// } + if (!(GlobalConstants.JYY + getCurrentDateStr()).equals(Sm4Utils.decrypt(HeaderFetchUtil.getSign(requestHeader)))) { + throw new ServiceException("访问缺少认证信息"); + } try { orderInfoService.insertZhhqOrderInfo(dto); return AjaxResult.success(); @@ -52,9 +52,9 @@ public class ZhhqOrderController extends BaseController { @ApiOperation("退款") @PostMapping({"/refund"}) public AjaxResult refund(@RequestHeader Map requestHeader, @RequestBody @Valid OrderRefundDTO dto) { -// if (!(GlobalConstants.JYY + getCurrentDateStr()).equals(Sm4Utils.decrypt(HeaderFetchUtil.getSign(requestHeader)))) { -// throw new ServiceException("访问缺少认证信息"); -// } + if (!(GlobalConstants.JYY + getCurrentDateStr()).equals(Sm4Utils.decrypt(HeaderFetchUtil.getSign(requestHeader)))) { + throw new ServiceException("访问缺少认证信息"); + } try { orderInfoService.zhhqRefund(dto); return AjaxResult.success(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/OrderAddDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/OrderAddDTO.java index 417fda3..965787c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/OrderAddDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/OrderAddDTO.java @@ -1,10 +1,8 @@ package com.bonus.canteen.core.zhhq.domain; -import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; import com.bonus.canteen.core.order.constants.*; import com.bonus.canteen.core.order.domain.OrderInfo; -import com.bonus.canteen.core.order.domain.param.ShopOrderInfoAddParam; import com.bonus.canteen.core.pay.constants.PayChannelEnum; import com.bonus.canteen.core.pay.constants.PayStateEnum; import com.bonus.canteen.core.pay.constants.PayTypeEnum; @@ -20,9 +18,8 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import java.util.Objects; -import static com.bonus.common.houqin.constant.SourceTypeEnum.YWT_H5_MOBILE; +import static com.bonus.common.houqin.constant.SourceTypeEnum.HT_H5_MOBILE; @Data public class OrderAddDTO implements Serializable { @@ -46,7 +43,7 @@ public class OrderAddDTO implements Serializable { orderInfo.setDeviceSn(StringUtils.EMPTY); orderInfo.setDeviceNum(StringUtils.EMPTY); orderInfo.setUserId(accInfoVO.getUserId()); - orderInfo.setSourceType(YWT_H5_MOBILE.getKey()); + orderInfo.setSourceType(HT_H5_MOBILE.getKey()); orderInfo.setCreateBy(accInfoVO.getNickName()); orderInfo.setCreateTime(DateUtils.getNowDate()); orderInfo.setUpdateBy(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml index 6f22422..d0381c3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml @@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and iii.into_date #{endDateTime} - order by iii.into_date + order by material_id, iii.into_date