Selaa lähdekoodia

申请售后数据保存bug

LuoDLeo 7 kuukautta sitten
vanhempi
commit
77bf12c5aa

+ 21 - 7
src/main/java/org/springblade/modules/finance/entity/AfterSalesGoods.java

@@ -1,11 +1,10 @@
 package org.springblade.modules.finance.entity;
 
-import org.springblade.common.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.common.base.BaseEntity;
 
 /**
  * 售后商品表实体类
@@ -19,11 +18,26 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value = "AfterSalesGoods对象", description = "售后商品表")
 public class AfterSalesGoods extends BaseEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 售后id
+     */
+    private Long afterSalesId;
+
+    /**
+     * 售后商品数量
+     */
+    private Integer goodsNum;
 
-private Long afterSalesId;
-private Integer goodsNum;
-private Long orderGrouponGoodsId;
+    /**
+     * 团购商品id
+     */
+    private Long orderGrouponGoodsId;
 
+    /**
+     * 商品id
+     */
+    private Long orderGoodsId;
 
 }

+ 1 - 1
src/main/java/org/springblade/modules/finance/mapper/AfterSalesGoodsMapper.xml

@@ -26,7 +26,7 @@
 			asg.goods_num refundGoodsNum
         FROM
             t_after_sales_goods asg
-            JOIN t_order_groupon_goods ogg ON asg.order_groupon_goods_id = ogg.id
+            JOIN t_order_goods ogg ON asg.order_goods_id = ogg.id
         WHERE
             asg.after_sales_id = #{afterSalesId}
     </select>

+ 1 - 0
src/main/java/org/springblade/modules/finance/service/impl/AfterSalesServiceImpl.java

@@ -179,6 +179,7 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
 			AfterSalesGoods afterSalesGoods = new AfterSalesGoods();
 			afterSalesGoods.setAfterSalesId(afterSales.getId());
 			afterSalesGoods.setGoodsNum(orderGoods.getGoodsNum());
+			afterSalesGoods.setOrderGoodsId(orderGoods.getId());
 			//afterSalesGoods.setOrderGrouponGoodsId();
 			afterSalesGoodss.add(afterSalesGoods);
 		}