From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java
index d5595e3..760b3c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java
@@ -38,10 +38,10 @@
private UnionIntegralRecordService unionIntegralRecordService;
@Override
- public R getList(int pageNum,int pageSize, String communityId, String userId)
+ public R getList(int pageNum,int pageSize, String communityId, String userId,String orderType)
{
Page page=new Page(pageNum,pageSize);
- return R.ok(baseMapper.getList(page,communityId,userId));
+ return R.ok(baseMapper.getList(page,communityId,userId,orderType));
}
@Override
@@ -107,7 +107,15 @@
item.setOrderNum(Snowflake.getId()+"");
- item.setOrderType("1");
+ //判断是否是邮寄
+ if(StringUtils.equals("1",item.getPickUpMethod()))
+ {
+ item.setOrderType("1");
+ }
+ else
+ {
+ item.setOrderType("3");
+ }
item.setPlayIntegral(allPrice+"");
int num= baseMapper.insert(item);
--
Gitblit v1.7.1