|
@@ -923,7 +923,11 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
}
|
|
}
|
|
sellOrder.setExpectAmount(sellOrder.getActualAmount().add(sellOrder.getBalanceAmount()));
|
|
sellOrder.setExpectAmount(sellOrder.getActualAmount().add(sellOrder.getBalanceAmount()));
|
|
// sellOrder.setSellCost2(JSONObject.toJSONString(costMap));
|
|
// sellOrder.setSellCost2(JSONObject.toJSONString(costMap));
|
|
- sellOrder.setType(SellTypeEnum.valueOf(goodsSellDto.getGoodsType()));
|
|
|
|
|
|
+ if(SellTypeEnum.ACCESSORIES.getCode().equals(goodsSellDto.getGoodsType())||SellTypeEnum.INSTRUMENT.getCode().equals(goodsSellDto.getGoodsType())){
|
|
|
|
+ sellOrder.setType(SellTypeEnum.valueOf(goodsSellDto.getGoodsType()));
|
|
|
|
+ }else{
|
|
|
|
+ sellOrder.setType(SellTypeEnum.OTHER);
|
|
|
|
+ }
|
|
sellOrder.setGoodsId(sellOrder.getGoodsId());
|
|
sellOrder.setGoodsId(sellOrder.getGoodsId());
|
|
sellOrder.setGoodsName(goodsSellDto.getGoodsName());
|
|
sellOrder.setGoodsName(goodsSellDto.getGoodsName());
|
|
sellOrder.setUserId(studentGoodsSell.getUserId());
|
|
sellOrder.setUserId(studentGoodsSell.getUserId());
|