|
@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
|
|
|
import com.ym.mec.biz.dal.entity.Goods;
|
|
|
import com.ym.mec.biz.dal.entity.StudentGoodsSell;
|
|
|
import com.ym.mec.biz.dal.entity.StudentInstrument;
|
|
|
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
|
|
|
import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
|
|
|
import com.ym.mec.biz.service.StudentGoodsSellService;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
@@ -110,8 +111,8 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<StudentInstrument> saveStudentInstrument(String orderNo) {
|
|
|
- StudentGoodsSell studentGoodsSell = studentGoodsSellDao.findByOrderNo(orderNo);
|
|
|
+ public List<StudentInstrument> saveStudentInstrument(StudentPaymentOrder order) {
|
|
|
+ StudentGoodsSell studentGoodsSell = studentGoodsSellDao.findByOrderNo(order.getOrderNo());
|
|
|
List<GoodsSellDto> goodsSellDtos = JSONObject.parseArray(studentGoodsSell.getGoodsJson(), GoodsSellDto.class);
|
|
|
List<Integer> goodsIds = new ArrayList<>();
|
|
|
for (GoodsSellDto goodsSellDto : goodsSellDtos) {
|
|
@@ -134,6 +135,7 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
|
|
|
studentInstrument.setGoodsBrand(goods.getBrand());
|
|
|
studentInstrument.setSpecification(goods.getSpecification());
|
|
|
studentInstrument.setGoodsImg(goods.getImage());
|
|
|
+ studentInstrument.setOrderId(order.getId());
|
|
|
studentInstrument.setStatus(0);
|
|
|
studentInstruments.add(studentInstrument);
|
|
|
}
|