创建订单修改
This commit is contained in:
@@ -945,9 +945,7 @@ public class CartService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<TbActivateOutRecord> outRecords = new ArrayList<>();
|
List<TbActivateOutRecord> outRecords = new ArrayList<>();
|
||||||
for (int i = 0; i < array.size(); i++) {
|
for (TbCashierCart cashierCart : cashierCartList) {
|
||||||
JSONObject object = array.getJSONObject(i);
|
|
||||||
TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
|
|
||||||
if (cashierCart.getIsVip().equals((byte) 1)) {
|
if (cashierCart.getIsVip().equals((byte) 1)) {
|
||||||
List<TbActivateInRecord> actInRecords = activateInRecordService.queryAllByVipIdAndShopIdAndProId(
|
List<TbActivateInRecord> actInRecords = activateInRecordService.queryAllByVipIdAndShopIdAndProId(
|
||||||
Integer.valueOf(tbShopUser.getId()), Integer.valueOf(orderInfo.getShopId()), Integer.valueOf(cashierCart.getProductId()));
|
Integer.valueOf(tbShopUser.getId()), Integer.valueOf(orderInfo.getShopId()), Integer.valueOf(cashierCart.getProductId()));
|
||||||
@@ -974,10 +972,6 @@ public class CartService {
|
|||||||
cashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
|
cashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
|
||||||
cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum());
|
cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum());
|
||||||
mpCashierCartMapper.updateById(cashierCart);
|
mpCashierCartMapper.updateById(cashierCart);
|
||||||
object.put("updatedAt", System.currentTimeMillis());
|
|
||||||
object.put("orderId", orderId + "");
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!CollectionUtils.isEmpty(outRecords)) outRecordMapper.insertBatch(outRecords);
|
if(!CollectionUtils.isEmpty(outRecords)) outRecordMapper.insertBatch(outRecords);
|
||||||
|
|||||||
Reference in New Issue
Block a user