bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i国网：订单提交数据 

i国网：退单提交数据
This commit is contained in:
gaowdong 2025-07-14 13:15:03 +08:00
parent cf5cc60fe4
commit 693517b9e0
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/SourceTypeEnum.java
View File

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

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/controller/ZhhqOrderController.java
View File

@ -37,9 +37,9 @@ public class ZhhqOrderController extends BaseController {
@ApiOperation("消费扣款")
@PostMapping({"/payment"})
public AjaxResult payment(@RequestHeader Map<String, String> 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<String, String> 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();

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/OrderAddDTO.java
View File

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

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml
View File

@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="endDateTime != null">
and iii.into_date <![CDATA[ <= ]]> #{endDateTime}
</if>
order by iii.into_date
order by material_id, iii.into_date
</select>
<select id="selectImsIntoInventoryDetailListByIntoDetailId" resultMap="ImsIntoInventoryDetailResult">