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

供应链-退单git合并处理

This commit is contained in:
jjLv 2025-05-22 09:30:33 +08:00
parent d093680218
commit 91bef4a27b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpRefundGoodsPageDTO.java
View File

@ -68,7 +68,6 @@ public class DrpRefundGoodsPageDTO {
return this.crtimeEnd; return this.crtimeEnd;
} }
public String getRelateOrderGoodsId() { public String getRelateOrderGoodsId() {
return this.relateOrderGoodsId; return this.relateOrderGoodsId;
} }
@ -125,7 +124,6 @@ public class DrpRefundGoodsPageDTO {
return this; return this;
} }
public DrpRefundGoodsPageDTO setRelateOrderGoodsId(final String relateOrderGoodsId) { public DrpRefundGoodsPageDTO setRelateOrderGoodsId(final String relateOrderGoodsId) {
this.relateOrderGoodsId = relateOrderGoodsId; this.relateOrderGoodsId = relateOrderGoodsId;
return this; return this;

14
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpRefundGoodsServiceImpl.java
View File

@ -19,12 +19,12 @@ import com.bonus.canteen.core.utils.CustomIdGenerateUtil;
import com.bonus.common.houqin.constant.DelFlagEnum; import com.bonus.common.houqin.constant.DelFlagEnum;
import com.bonus.common.houqin.utils.LeBeanUtil; import com.bonus.common.houqin.utils.LeBeanUtil;
import com.bonus.common.houqin.utils.id.Id; import com.bonus.common.houqin.utils.id.Id;
import com.github.pagehelper.page.PageMethod;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -50,11 +50,12 @@ public class DrpRefundGoodsServiceImpl extends ServiceImpl<DrpRefundGoodsMapper,
String refundGoodsId = CustomIdGenerateUtil.generateRefundGoodsId(); String refundGoodsId = CustomIdGenerateUtil.generateRefundGoodsId();
drpRefundGoods.setRefundGoodsId(refundGoodsId); drpRefundGoods.setRefundGoodsId(refundGoodsId);
drpRefundGoods.setRelateOrderGoodsId(content.getOrderGoodsId()); drpRefundGoods.setRelateOrderGoodsId(content.getOrderGoodsId());
drpRefundGoods.setRefundTime(content.getRefundTime());
this.baseMapper.insert(drpRefundGoods); this.baseMapper.insert(drpRefundGoods);
Iterator var4 = content.getDetailList().iterator(); Iterator<DrpRefundGoodsDetailAddDTO> var4 = content.getDetailList().iterator();
while(var4.hasNext()) { while(var4.hasNext()) {
DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = (DrpRefundGoodsDetailAddDTO)var4.next(); DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = var4.next();
DrpRefundGoodsDetail drpRefundGoodsDetail = new DrpRefundGoodsDetail(); DrpRefundGoodsDetail drpRefundGoodsDetail = new DrpRefundGoodsDetail();
BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpRefundGoodsDetail, new String[0]); BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpRefundGoodsDetail, new String[0]);
drpRefundGoodsDetail.setRefundDetailId(Id.next()); drpRefundGoodsDetail.setRefundDetailId(Id.next());
@ -70,11 +71,12 @@ public class DrpRefundGoodsServiceImpl extends ServiceImpl<DrpRefundGoodsMapper,
drpOutInventoryAddDTO.setTotalNum(content.getRefundTotalNum()); drpOutInventoryAddDTO.setTotalNum(content.getRefundTotalNum());
drpOutInventoryAddDTO.setOutType(DrpOutInventoryTypeEnum.BACK.key()); drpOutInventoryAddDTO.setOutType(DrpOutInventoryTypeEnum.BACK.key());
drpOutInventoryAddDTO.setRemark("退货出库"); drpOutInventoryAddDTO.setRemark("退货出库");
List<DrpOutDetailAddDTO> outDetailList = new ArrayList(); List<DrpOutDetailAddDTO> outDetailList = new ArrayList<>();
Iterator var11 = content.getDetailList().iterator(); Iterator<DrpRefundGoodsDetailAddDTO> var11 = content.getDetailList().iterator();
while(var11.hasNext()) { while(var11.hasNext()) {
DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = (DrpRefundGoodsDetailAddDTO)var11.next();
DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = var11.next();
DrpOutDetailAddDTO drpOutDetailAddDTO = new DrpOutDetailAddDTO(); DrpOutDetailAddDTO drpOutDetailAddDTO = new DrpOutDetailAddDTO();
BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpOutDetailAddDTO, new String[0]); BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpOutDetailAddDTO, new String[0]);
drpOutDetailAddDTO.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum()); drpOutDetailAddDTO.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum());