修改退货时明细记录退货主表bug

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java

@@ -91,13 +91,13 @@ public class ReturnSaleController {
         saleReturnVO.setReturnSale(returnSale);
         QueryWrapper<ReturnDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("product_id")
-                .eq("sale_id",id)
+                .eq("return_sale_id",id)
                 .groupBy("product_id");
         List<String> list = returnDetailService.selectByCondition1(queryWrapper);
         List<SaleDetailDTO> saleDetailDTOS = new ArrayList<>();
         for(String productId : list){
             QueryWrapper<ReturnDetail> queryPWrapper = new QueryWrapper<>();
-            queryPWrapper.eq("sale_id",id).eq("product_id",productId);
+            queryPWrapper.eq("return_sale_id",id).eq("product_id",productId);
             List<ReturnDetail> saleDetailList = returnDetailService.list(queryPWrapper);
             List<SaleDetailQueryDTO> saleDetailQueryDTOS = new ArrayList<>();
             SaleDetailDTO saleDetailDTO = new SaleDetailDTO();
@@ -202,7 +202,17 @@ public class ReturnSaleController {
         QueryWrapper<ReturnSale> queryWrapper = new QueryWrapper<>();
         if (!ObjectUtils.isEmpty(saleComVO)){
             if (!StringUtils.isEmpty(saleComVO.getShopId())) queryWrapper.eq("shop_id",saleComVO.getShopId());
-            queryWrapper.ne("status","5");
+            if (!StringUtils.isEmpty(saleComVO.getSaleId())) queryWrapper.eq("sale_id",saleComVO.getSaleId());
+            String remark = saleComVO.getRemark();
+            if(!StringUtils.isEmpty(remark)){
+                if("1".equals(remark)){
+                    queryWrapper.ne("status","5");
+                }else if("2".equals(remark)){
+                    queryWrapper.eq("status","5");
+                }
+            }else {
+                return ResultUtil.error("退货标识参数缺失，请确认！");
+            }
             SearchDateVo searchDateVo = saleComVO.getSearchDateVo();
             if (!ObjectUtils.isEmpty(searchDateVo) && !searchDateVo.isAnyFieldEmpty()){
                 Date endDate = searchDateVo.getEndDate();
@@ -233,7 +243,17 @@ public class ReturnSaleController {
         QueryWrapper<ReturnSale> queryWrapper = new QueryWrapper<>();
         if (!ObjectUtils.isEmpty(saleComVO)){
             if (!StringUtils.isEmpty(saleComVO.getShopId())) queryWrapper.eq("shop_id",saleComVO.getShopId());
-            queryWrapper.ne("status","5");
+            if (!StringUtils.isEmpty(saleComVO.getSaleId())) queryWrapper.eq("sale_id",saleComVO.getSaleId());
+            String remark = saleComVO.getRemark();
+            if(!StringUtils.isEmpty(remark)){
+                if("1".equals(remark)){
+                    queryWrapper.ne("status","5");
+                }else if("2".equals(remark)){
+                    queryWrapper.eq("status","5");
+                }
+            }else {
+                return ResultUtil.error("退货标识参数缺失，请确认！");
+            }
             SearchDateVo searchDateVo = saleComVO.getSearchDateVo();
             if (!ObjectUtils.isEmpty(searchDateVo) && !searchDateVo.isAnyFieldEmpty()){
                 Date endDate = searchDateVo.getEndDate();

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java

@@ -1,5 +1,6 @@
 package cc.hiver.mall.entity;
 
+import cc.hiver.core.common.utils.SnowFlakeUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -14,7 +15,7 @@ import java.util.Date;
 @ApiModel(value = "退货单主表")
 @TableName(value = "t_return_sale", autoResultMap = true)
 public class ReturnSale implements Serializable {
-    private String id;
+    private String id = "TD" + SnowFlakeUtil.nextId().toString();
 
     private String saleId;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SaleComVO.java

@@ -9,9 +9,14 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-@ApiModel(value = "销售单主表")
+@ApiModel(value = "退货单主表")
 public class SaleComVO implements Serializable {
 
+    @ApiModelProperty(value = "列表清单标识   1-待退货  2-已退货标识  3-全部退货信息，含待退和已退")
+    private String remark;
+
+    @ApiModelProperty(value = "原订单Id")
+    private String saleId;
 
     @ApiModelProperty(value = "店铺ID")
     private String shopId;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java

@@ -209,7 +209,8 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
         Sale sale = saleService.getById(id);
         ReturnSale returnSale = new ReturnSale();
         returnSale.setCreateTime(new Date());
-        BeanUtils.copyBeanProp(returnSale,sale);
+        //BeanUtils.copyBeanProp(returnSale,sale);
+        org.springframework.beans.BeanUtils.copyProperties(sale,returnSale,"id");
         //重置退单状态和运送公司
         returnSale.setStatus("1");
         returnSale.setTransCompany(null);

hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml

@@ -123,14 +123,14 @@
       unit, shop_id, category_id, 
       attribute_list, price, purchase_price, 
       wholesale_price, product_count, discount, 
-      discount_amount, real_price)
+      discount_amount, real_price,return_sale_id)
     values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{saleId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, 
       #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, 
       #{attributeList,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, 
       #{wholesalePrice,jdbcType=DECIMAL}, #{productCount,jdbcType=INTEGER}, #{discount,jdbcType=DECIMAL}, 
-      #{discountAmount,jdbcType=DECIMAL}, #{realPrice,jdbcType=DECIMAL})
+      #{discountAmount,jdbcType=DECIMAL}, #{realPrice,jdbcType=DECIMAL},#{returnSaleId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="cc.hiver.mall.entity.ReturnDetail">
     insert into t_return_detail