|
@@ -102,6 +102,7 @@ public class TCoinOrderController {
|
|
String sn = coinOrderVO.getSn();
|
|
String sn = coinOrderVO.getSn();
|
|
// no: 商品名称-编号-数量,玫瑰精灵-A01-1,雪糕-I01-1
|
|
// no: 商品名称-编号-数量,玫瑰精灵-A01-1,雪糕-I01-1
|
|
String no = coinOrderVO.getNo();
|
|
String no = coinOrderVO.getNo();
|
|
|
|
+ String memberCode = coinOrderVO.getMemberCode();
|
|
LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper.eq(TCoinOrder::getSn, sn);
|
|
queryWrapper.eq(TCoinOrder::getSn, sn);
|
|
List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
|
|
List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
|
|
@@ -143,6 +144,7 @@ public class TCoinOrderController {
|
|
// 0或null 非空中云汇
|
|
// 0或null 非空中云汇
|
|
coinOrder.setIsAir("0");
|
|
coinOrder.setIsAir("0");
|
|
coinOrder.setEquipmentId(equipment.getId());
|
|
coinOrder.setEquipmentId(equipment.getId());
|
|
|
|
+ coinOrder.setMemberCode(memberCode);
|
|
|
|
|
|
// 保存订单明细
|
|
// 保存订单明细
|
|
TOrderDetails tOrderDetails = new TOrderDetails();
|
|
TOrderDetails tOrderDetails = new TOrderDetails();
|
|
@@ -243,6 +245,7 @@ public class TCoinOrderController {
|
|
BigDecimal price = coinOrderVO.getPrice();
|
|
BigDecimal price = coinOrderVO.getPrice();
|
|
String sn = coinOrderVO.getSn();
|
|
String sn = coinOrderVO.getSn();
|
|
BigDecimal tax = coinOrderVO.getTax();
|
|
BigDecimal tax = coinOrderVO.getTax();
|
|
|
|
+ String memberCode = coinOrderVO.getMemberCode();
|
|
LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper.eq(TCoinOrder::getSn, sn);
|
|
queryWrapper.eq(TCoinOrder::getSn, sn);
|
|
List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
|
|
List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
|
|
@@ -282,6 +285,7 @@ public class TCoinOrderController {
|
|
coinOrder.setIsAir("0");
|
|
coinOrder.setIsAir("0");
|
|
coinOrder.setEquipmentId(equipment.getId());
|
|
coinOrder.setEquipmentId(equipment.getId());
|
|
coinOrder.setTax(tax);
|
|
coinOrder.setTax(tax);
|
|
|
|
+ coinOrder.setMemberCode(memberCode);
|
|
|
|
|
|
// 保存订单明细
|
|
// 保存订单明细
|
|
TOrderDetails tOrderDetails = new TOrderDetails();
|
|
TOrderDetails tOrderDetails = new TOrderDetails();
|