From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 149 insertions(+), 18 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
index b403130..b6d2ebe 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
@@ -21,18 +21,19 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.dto.MoneyCardOperationDto;
-import com.matrix.system.hive.dto.MoneyCardPayDto;
import com.matrix.system.hive.dto.ProjUseOperationDto;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.MoneyCardUseService;
+import com.matrix.system.hive.service.SysInstoreInfoService;
import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.score.entity.ScoreVipDetail;
@@ -42,6 +43,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -60,6 +62,12 @@
@Component
public class SysOrderServiceHelper {
+
+ @Autowired
+ SysInstoreInfoService sysInstoreInfoService;
+
+ @Autowired
+ private SysSupplierInfoDao sysSupplierInfoDao;
@Autowired
ScoreVipDetailService scoreVipDetailService;
@@ -173,11 +181,14 @@
Double zk = sysOrderItem.getZkPrice() / sysOrderItem.getPrice();
projUseOperationDto.setTcZk(zk);
}
+
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
projUseOperationDto.setPayMoney(sysOrderItem.getZkPrice());
projUseOperationDto.setGoodsId(sysOrderItem.getGoodsId());
projUseOperationDto.setCount(sysOrderItem.getCount());
projUseOperationDto.setVipId(order.getVipId());
projUseOperationDto.setOrderItemId(sysOrderItem.getId());
+ projUseOperationDto.setUpdateUserId(sysUsers.getSuId());
projUseDtoList.add(projUseOperationDto);
}
sysProjUseService.addUserProjUse(projUseDtoList);
@@ -191,7 +202,7 @@
*/
private boolean isGiftMoneyPay(SysOrder order) {
BusParameterSettings giftiIsfree = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_GIFTISFREE, order.getCompanyId());
- if (giftiIsfree.getParamValue().equals("是")) {
+ if (BooleanEnum.TRUE.getValue() == giftiIsfree.getIntParamValue()) {
return order.getFlows().stream().allMatch(item -> SysOrderFlow.IS_GIFT_Y.equals(item.getIsGift())
&& item.getAmount().doubleValue() > 0D);
} else {
@@ -215,34 +226,36 @@
List<SysOrderFlow> flows = pageOrder.getFlows();
List<Long> goodsIds = pageOrder.getItems().stream().map(e -> e.getGoodsId()).collect(Collectors.toList());
- List<MoneyCardPayDto> moneyCardPayDtoList = Lists.newArrayList();
+ List<MoneyCardOperationDto> moneyCardOperationDtos = Lists.newArrayList();
flows.forEach(flow -> {
if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
if (flow.getCardId() != null) {
- MoneyCardPayDto dto = new MoneyCardPayDto();
+ MoneyCardOperationDto dto = new MoneyCardOperationDto();
dto.setOrderNo(pageOrder.getOrderNo());
dto.setOrderId(pageOrder.getId());
dto.setCount(1);
dto.setCarUseId(flow.getCardId());
dto.setType(MoneyCardUseFlow.USE_TYPE_CONSUMER);
if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
- dto.setGiftMoney(flow.getAmount().doubleValue());
+ dto.setGiftMoney(-flow.getAmount().doubleValue());
+ dto.setRealMoney(0D);
} else {
- dto.setRealMoney(flow.getAmount().doubleValue());
+ dto.setRealMoney(-flow.getAmount().doubleValue());
+ dto.setGiftMoney(0D);
}
dto.setUpdateUser(user.getSuId());
dto.setGoodsIds(goodsIds);
- moneyCardPayDtoList.add(dto);
+ moneyCardOperationDtos.add(dto);
} else {
throw new GlobleException("无效的储值卡支付方式");
}
}
});
- if (CollectionUtils.isNotEmpty(moneyCardPayDtoList)) {
- LogUtil.info("扣除储值卡余额{}", JSON.toJSONString(moneyCardPayDtoList));
- moneyCardUseService.changeMoneyCard(moneyCardPayDtoList);
+ if (CollectionUtils.isNotEmpty(moneyCardOperationDtos)) {
+ LogUtil.info("扣除储值卡余额{}", JSON.toJSONString(moneyCardOperationDtos));
+ moneyCardUseService.changeMoneyCard(moneyCardOperationDtos);
}
}
@@ -253,14 +266,14 @@
*/
public void returnMoneyCardPay(SysOrder order) {
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- List<MoneyCardPayDto> moneyCardPayDtoList = Lists.newArrayList();
+ List<MoneyCardOperationDto> moneyCardOperationDtos = Lists.newArrayList();
List<SysOrderFlow> flows = sysOrderFlowDao.selectByOrderId(order.getId());
// 非现金收款退回扣卡余额
for (SysOrderFlow flow : flows) {
if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
if (flow.getCardId() != null) {
- MoneyCardPayDto dto = new MoneyCardPayDto();
+ MoneyCardOperationDto dto = new MoneyCardOperationDto();
dto.setOrderNo(order.getOrderNo());
dto.setOrderId(order.getId());
dto.setCount(1);
@@ -272,16 +285,16 @@
dto.setRealMoney(flow.getAmount().doubleValue());
}
dto.setUpdateUser(user.getSuId());
- moneyCardPayDtoList.add(dto);
+ moneyCardOperationDtos.add(dto);
} else {
throw new GlobleException("无效的储值卡支付方式");
}
}
}
- if (CollectionUtils.isNotEmpty(moneyCardPayDtoList)) {
- LogUtil.info("退回储值卡余额{}", JSON.toJSONString(moneyCardPayDtoList));
- moneyCardUseService.changeMoneyCard(moneyCardPayDtoList);
+ if (CollectionUtils.isNotEmpty(moneyCardOperationDtos)) {
+ LogUtil.info("退回储值卡余额{}", JSON.toJSONString(moneyCardOperationDtos));
+ moneyCardUseService.changeMoneyCard(moneyCardOperationDtos);
}
}
@@ -293,6 +306,7 @@
public void addMoneyCardUse(SysOrder sourceOrder) {
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
List<MoneyCardOperationDto> moneyCardOperationDtos = Lists.newArrayList();
List<SysOrderItem> orderItemList = sourceOrder.getItems();
for (SysOrderItem sysOrderItem : orderItemList) {
@@ -301,15 +315,20 @@
for (int i = 0; i < sysOrderItem.getCount(); i++) {
MoneyCardOperationDto moneyCardOperationDto = new MoneyCardOperationDto();
- moneyCardOperationDto.setVipId(sourceOrder.getVipId());
// 是否为赠送
if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_YES)) {
moneyCardOperationDto.setSource(Dictionary.TAOCAN_SOURCE_ZS);
} else {
moneyCardOperationDto.setSource(Dictionary.TAOCAN_SOURCE_GM);
}
+ moneyCardOperationDto.setType(MoneyCardUseFlow.USE_TYPE_GM);
moneyCardOperationDto.setOrderItemId(sysOrderItem.getId());
moneyCardOperationDto.setGoodsId(sysOrderItem.getGoodsId());
+ moneyCardOperationDto.setOrderId(sourceOrder.getId());
+ moneyCardOperationDto.setOrderNo(sourceOrder.getOrderNo());
+ moneyCardOperationDto.setVipId(sourceOrder.getVipId());
+ moneyCardOperationDto.setUpdateUser(user.getSuId());
+
moneyCardOperationDtos.add(moneyCardOperationDto);
}
}
@@ -329,7 +348,8 @@
public void addOutStore(SysOrder order) {
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
- if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
List<SysOutStoreItem> storeItemList = new ArrayList<>();
@@ -608,12 +628,17 @@
for (SysOrderItem item : sysOrder.getItems()) {
ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(item.getGoodsId());
item.setType(shoppingGoods.getGoodType());
+ if (item.getZkPrice() == null) {
+ item.setZkPrice(shoppingGoods.getSealPice());
+ }
+
if (item.getZkPrice() == 0) {
item.setIsFree(Dictionary.FLAG_YES);
}
Double itemZkTotal = MoneyUtil.mul(item.getZkPrice(), Double.valueOf(item.getCount()));
zkTotal = MoneyUtil.add(zkTotal, itemZkTotal);
item.setStatus(Dictionary.ORDER_STATU_DFK);
+ item.setRefundCount(0);
}
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
@@ -624,6 +649,7 @@
sysOrder.setCompanyId(user.getCompanyId());
sysOrder.setOrderTime(new Date());
sysOrder.setOrderType(SysOrder.ORDER_TYPE_SEAL);
+
//新增订单
sysOrder.setOrderNo(codeService.getOrderCode());
@@ -717,5 +743,110 @@
return order;
}
+ /**
+ * 创建退款订单
+ * @return
+ */
+ public SysOrder createTkOrder(SysOrder sysOrder){
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
+ //原订单设置为退款状态
+ SysOrder sourceOrder = new SysOrder();
+ sourceOrder.setId(sysOrder.getOldOrderId());
+ sourceOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_Y);
+ sysOrderDao.update(sourceOrder);
+
+ sysOrder.setId(null);
+ sysOrder.setStaffId(user.getSuId());
+ sysOrder.setCompanyId(user.getCompanyId());
+ sysOrder.setShopId(user.getShopId());
+ sysOrder.setOrderType(SysOrder.ORDER_TYPE_REFUND);
+ sysOrder.setStatu(Dictionary.ORDER_STATU_YFK);
+ Date now = new Date();
+ sysOrder.setOrderTime(now);
+ sysOrder.setPayTime(now);
+ sysOrder.setOrderNo(codeService.getRefundOrderNo());
+ sysOrder.setZkTotal(-sysOrder.getZkTotal());
+
+ double cardPayTotal = 0D;
+ double cashPayTotal = 0D;
+ for (SysOrderFlow flow : sysOrder.getFlows()) {
+ // 若使用储值卡付款
+ if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
+ cardPayTotal += flow.getAmount().doubleValue();
+ } else {
+ cashPayTotal += flow.getAmount().doubleValue();
+ }
+ }
+ sysOrder.setCardPay(0-( sourceOrder.getCardPay() == null ? 0 : sourceOrder.getCardPay() + cardPayTotal));
+ sysOrder.setCashPay(0-(sourceOrder.getCashPay() == null ? 0 : sourceOrder.getCashPay() + cashPayTotal));
+
+
+ //新增订单
+ sysOrderDao.insert(sysOrder);
+ //插入明细
+ for (SysOrderItem item : sysOrder.getItems()) {
+
+ //更新原订单明细的可退数量
+ SysOrderItem oldItem = orderItemDao.selectById(item.getId());
+ if((oldItem.getRefundCount()+item.getCount()) <= oldItem.getCount()){
+ oldItem.setRefundCount(oldItem.getRefundCount()+item.getCount());
+ orderItemDao.update(oldItem);
+ }else{
+ throw new GlobleException("退款数量大于购买数量");
+ }
+ //插入新的订单明细
+ item.setCount(-item.getCount());
+ item.setZkPrice(-item.getZkPrice());
+ item.setOrderId(sysOrder.getId());
+ orderItemDao.insert(item);
+ }
+ LogUtil.info("创建退款订单：{} " , JSON.toJSONString(sysOrder) ) ;
+ return sysOrder;
+ }
+
+ /**
+ * 退款入库
+ */
+ public void refundInstore(@NotEmpty List<SysOrderItem> items) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ SysSupplierInfo supplierInfo = new SysSupplierInfo();
+ supplierInfo.setShopId(user.getShopId());
+ supplierInfo = sysSupplierInfoDao.selectByModel(supplierInfo).get(0);
+
+ Warehouse warehouse = warehouseDao.findShopWarehouse(user.getShopId()).get(0);
+ SysInstoreInfo instoreInfo = new SysInstoreInfo();
+ instoreInfo.setInstoreType(SysInstoreInfo.INSTORE_TYPE_RETURN);
+ instoreInfo.setInstoreDate(new Date());
+ instoreInfo.setSupplierId(supplierInfo.getId().toString());
+ instoreInfo.setStoreId(warehouse.getId());
+ instoreInfo.setShopId(user.getShopId());
+ instoreInfo.setCompanyId(user.getCompanyId());
+
+ Double total = 0.0;
+ List<SysInstoreDetail> instoreDetails = new ArrayList<>();
+ for (SysOrderItem item : items) {
+ ShoppingGoods goods = shoppingGoodsDao.selectById(item.getGoodsId());
+ SysInstoreDetail sysInstoreDetail = new SysInstoreDetail();
+ sysInstoreDetail.setAmount(item.getCount().doubleValue());
+ sysInstoreDetail.setPrice(item.getZkPrice());
+ sysInstoreDetail.setSkuId(goods.getId());
+
+ total = MoneyUtil.add(MoneyUtil.mul(Double.parseDouble(sysInstoreDetail.getAmount() + ""), sysInstoreDetail.getPrice()), total);
+ sysInstoreDetail.setInstoreId(instoreInfo.getId());
+ // 设置小计
+ sysInstoreDetail.setPriceTotal(MoneyUtil.mul(Double.parseDouble(sysInstoreDetail.getAmount() + ""), sysInstoreDetail.getPrice()));
+ instoreDetails.add(sysInstoreDetail);
+
+ }
+ instoreInfo.setInstoreDetails(instoreDetails);
+ instoreInfo.setSumall(total);
+
+ sysInstoreInfoService.add(instoreInfo);
+ //自动审核单据
+ sysInstoreInfoService.check(instoreInfo);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1