From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
index 5f06f91..bfe16d7 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
@@ -1,38 +1,19 @@
package com.matrix.system.shopXcx.api.action;
-import com.alibaba.fastjson.JSONObject;
-import com.matrix.biz.bean.BizUser;
import com.matrix.component.redis.RedisClient;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
-import com.matrix.core.tools.UUIDUtil;
import com.matrix.system.app.authority.AppAuthorityManager;
-import com.matrix.system.app.dto.LoginDto;
-import com.matrix.system.app.dto.PwdResetDto;
-import com.matrix.system.app.dto.SmsCodeDto;
-import com.matrix.system.app.dto.UploadPhotoDto;
-import com.matrix.system.app.vo.UserInfoVo;
-import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
-import com.matrix.system.common.authority.strategy.LoginStrategy;
-import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
-import com.matrix.system.common.tools.PasswordUtil;
-import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysOrderFlow;
-import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderFlowDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
-import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.ImageUtil;
import com.matrix.system.hive.service.SysShopInfoService;
import com.matrix.system.shopXcx.api.dto.ErpOrderListDto;
import com.matrix.system.shopXcx.api.vo.ErpOrderDetailFlowVo;
-import com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo;
import com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,9 +25,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
@@ -91,44 +69,44 @@
@Value("${static_resource_url}")
private String nginxUrl;
- @ApiOperation(value = "查询用户所有在ERP中产生的订单" )
+ @ApiOperation(value = "查询用户所有在ERP中产生的订单")
@ApiResponses({
- @ApiResponse(code = 200, message = "OK", response = ErpOrderListDto.class)
+ @ApiResponse(code = 200, message = "OK", response = ErpOrderListDto.class)
})
@PostMapping(value = "/findUserOrderList")
public AjaxResult findUserOrderList(@RequestBody @Validated ErpOrderListDto erpOrderListDto) {
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
+ SysVipInfo vipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+
erpOrderListDto.setVipId(vipInfo.getId());
- List<ErpOrderDetailVo> rows=sysOrderDao.selectErpOrderList(erpOrderListDto);
- rows.forEach(item->{
+ List<ErpOrderDetailVo> rows = sysOrderDao.selectErpOrderList(erpOrderListDto);
+ rows.forEach(item -> {
item.setItems(orderItemDao.selectErpOrderItemByOrderId(item.getOrderId()));
});
- return AjaxResult.buildSuccessInstance(rows,"查询成功");
+ return AjaxResult.buildSuccessInstance(rows, "查询成功");
+
+
}
- @ApiOperation(value = "查询用户在ERP中的订单详情" )
+ @ApiOperation(value = "查询用户在ERP中的订单详情")
@ApiResponses({
- @ApiResponse(code = 200, message = "OK", response = ErpOrderListDto.class)
+ @ApiResponse(code = 200, message = "OK", response = ErpOrderListDto.class)
})
@GetMapping(value = "/findUserOrderById/{orderId}")
public AjaxResult findUserOrderList(@PathVariable Long orderId) {
- ErpOrderDetailVo order=sysOrderDao.findUserOrderById(orderId);
+ ErpOrderDetailVo order = sysOrderDao.findUserOrderById(orderId);
order.setItems(orderItemDao.selectErpOrderItemByOrderId(order.getOrderId()));
List<SysOrderFlow> sysOrderFlows = orderFlowDao.selectPayMethodsAmountByOrderId(orderId);
- List<ErpOrderDetailFlowVo> flowVos=new ArrayList<>();
- sysOrderFlows.forEach(item->{
+ List<ErpOrderDetailFlowVo> flowVos = new ArrayList<>();
+ sysOrderFlows.forEach(item -> {
ErpOrderDetailFlowVo erpOrderDetailFlowVo = new ErpOrderDetailFlowVo();
- BeanUtils.copyProperties(item,erpOrderDetailFlowVo);
+ BeanUtils.copyProperties(item, erpOrderDetailFlowVo);
flowVos.add(erpOrderDetailFlowVo);
});
order.setFlow(flowVos);
AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");
- result.putInMap("order",order);
- return result;
+ result.putInMap("order", order);
+ return result;
}
-
-
}
--
Gitblit v1.9.1