修复了商品销售管理查询的小BUG

src/main/java/com/yeqifu/bus/controller/SalesbackController.java

@@ -59,7 +59,7 @@ public class SalesbackController {
     }
 
     /**t
-     * 查询商品退货
+     * 查询商品销售退货
      * @param salesbackVo
      * @return
      */
@@ -74,25 +74,26 @@ public class SalesbackController {
         //对时间进行查询要求大于开始时间小于结束时间
         queryWrapper.ge(salesbackVo.getStartTime()!=null,"salesbacktime",salesbackVo.getStartTime());
         queryWrapper.le(salesbackVo.getEndTime()!=null,"salesbacktime",salesbackVo.getEndTime());
-        //通过进货时间对商品进行排序
+        //通过商品退货时间对商品进行排序
         queryWrapper.orderByDesc("salesbacktime");
-        IPage<Salesback> page1 = salesbackService.page(page, queryWrapper);
-        List<Salesback> records = page1.getRecords();
+        salesbackService.page(page, queryWrapper);
+        List<Salesback> records = page.getRecords();
         for (Salesback salesback : records) {
-            //设置客户姓名
+            System.out.println("============================");
             Customer customer = customerService.getById(salesback.getCustomerid());
             if (customer!=null){
-                customer.setCustomername(customer.getCustomername());
+                //设置客户姓名
+                salesback.setCustomername(customer.getCustomername());
             }
-            //设置商品名称和商品规格
             Goods goods = goodsService.getById(salesback.getGoodsid());
             if (goods!=null){
-                goods.setGoodsname(goods.getGoodsname());
-                goods.setSize(goods.getSize());
+                //设置商品名称
+                salesback.setGoodsname(goods.getGoodsname());
+                //设置商品规格
+                salesback.setSize(goods.getSize());
             }
-
         }
-        return new DataGridView(page1.getTotal(),page1.getRecords());
+        return new DataGridView(page.getTotal(),page.getRecords());
     }
 
     /**

src/main/java/com/yeqifu/bus/entity/Sales.java

@@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -43,7 +42,7 @@ public class Sales implements Serializable {
 
     private String remark;
 
-    private BigDecimal saleprice;
+    private Double saleprice;
 
     private Integer goodsid;
 

src/main/java/com/yeqifu/bus/service/impl/OutportServiceImpl.java

@@ -59,7 +59,9 @@ public class OutportServiceImpl extends ServiceImpl<OutportMapper, Outport> impl
         outport.setNumber(number);
         User user = (User) WebUtils.getSession().getAttribute("user");
         outport.setOperateperson(user.getName());
+
         outport.setOutportprice(inport.getInportprice());
+
         outport.setPaytype(inport.getPaytype());
         outport.setOutputtime(new Date());
         outport.setRemark(remark);

src/main/java/com/yeqifu/bus/service/impl/SalesbackServiceImpl.java

@@ -44,7 +44,7 @@ public class SalesbackServiceImpl extends ServiceImpl<SalesbackMapper, Salesback
         //2.根据商品ID查询商品信息
         Goods goods = goodsMapper.selectById(sales.getGoodsid());
         //3.修改商品的数量     商品的数量-退货的数量
-        goods.setNumber(goods.getNumber()-number);
+        goods.setNumber(goods.getNumber()+number);
 
         //修改进货的数量
         sales.setNumber(sales.getNumber()-number);
@@ -55,15 +55,23 @@ public class SalesbackServiceImpl extends ServiceImpl<SalesbackMapper, Salesback
 
         //5.添加退货单信息
         Salesback salesback = new Salesback();
-        salesback.setGoodsid(salesback.getGoodsid());
+        salesback.setGoodsid(sales.getGoodsid());
+
         salesback.setNumber(number);
         User user = (User) WebUtils.getSession().getAttribute("user");
         salesback.setOperateperson(user.getName());
-        salesback.setSalebackprice(salesback.getSalebackprice());
-        salesback.setPaytype(salesback.getPaytype());
+
+
+        salesback.setSalebackprice(sales.getSaleprice());
+        salesback.setPaytype(sales.getPaytype());
+
         salesback.setSalesbacktime(new Date());
         salesback.setRemark(remark);
-        salesback.setCustomerid(salesback.getCustomerid());
+
+
+        salesback.setCustomerid(sales.getCustomerid());
+
+
         getBaseMapper().insert(salesback);
     }
     

src/main/resources/templates/business/salesback/salesbackManager.html

@@ -217,7 +217,7 @@
             var dom = $("#select_goodsid");
             var html = '<option value="0">请选择商品</option>';
             $.each(data,function (index, item) {
-                html += '<option value="'+item.id+'">'+item.goodsname+'-['+item.size+']-'+'['+item.customername+']'+'</option>';
+                html += '<option value="'+item.id+'">'+item.goodsname+'-['+item.size+']-'+'['+item.providername+']'+'</option>';
             });
             dom.html(html);
             //重新渲染下拉列表