|
@@ -379,8 +379,8 @@ public class TPromoCodeController {
|
|
money = price.getPrice();
|
|
money = price.getPrice();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- String sn = orderService.initSn(equipmentId);
|
|
|
|
|
|
+ Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
|
|
|
|
+ String sn = orderService.initSn(client6);
|
|
String orderNo = sn;
|
|
String orderNo = sn;
|
|
String productName = "优惠码";
|
|
String productName = "优惠码";
|
|
BigDecimal price = BigDecimal.valueOf(money*number);
|
|
BigDecimal price = BigDecimal.valueOf(money*number);
|
|
@@ -444,11 +444,11 @@ public class TPromoCodeController {
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
- Long equipmentId = equipment.getId();
|
|
|
|
-
|
|
|
|
|
|
+// Long equipmentId = equipment.getId();
|
|
|
|
+ Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
|
|
List<String> codes =new ArrayList<>();
|
|
List<String> codes =new ArrayList<>();
|
|
for(int i=0;i<number;i++){
|
|
for(int i=0;i<number;i++){
|
|
- String code = orderService.initSn(equipmentId);
|
|
|
|
|
|
+ String code = orderService.initSn(client6);
|
|
StringBuffer str = new StringBuffer();
|
|
StringBuffer str = new StringBuffer();
|
|
str.append(code.substring(0,6));
|
|
str.append(code.substring(0,6));
|
|
codes.add(str.toString());
|
|
codes.add(str.toString());
|