|
@@ -72,25 +72,32 @@ public class TSugarDoController {
|
|
|
if (equipmentId != null) {
|
|
|
TEquipment equipment = tEquipmentService.getById(equipmentId);
|
|
|
Long equipmentAdminId = equipment.getAdminId();
|
|
|
- //判断本日是否已做二十个糖
|
|
|
- LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
|
|
|
- query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
|
|
|
|
|
|
+ // 判断是否是海外账户,海外账户不限制制作数量
|
|
|
+ TAdmin admin = tAdminService.getById(equipmentAdminId);
|
|
|
+ String ifForeign = admin.getIfForeign();
|
|
|
|
|
|
- Calendar todayStart = Calendar.getInstance();
|
|
|
- todayStart.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
- todayStart.set(Calendar.MINUTE, 0);
|
|
|
- todayStart.set(Calendar.SECOND, 0);
|
|
|
- query.gt(TSugarDo::getCreateDate, todayStart.getTime());
|
|
|
- Calendar todayEnd = Calendar.getInstance();
|
|
|
- todayEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
- todayEnd.set(Calendar.MINUTE, 59);
|
|
|
- todayEnd.set(Calendar.SECOND, 59);
|
|
|
- query.le(TSugarDo::getCreateDate, todayEnd.getTime());
|
|
|
- query.eq(TSugarDo::getStatus, "1");
|
|
|
- List<TSugarDo> sugarDoList = tSugarDoService.list(query);
|
|
|
- if (sugarDoList.size() > 20) {
|
|
|
- return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
|
|
|
+ if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("0")) {
|
|
|
+ //判断本日是否已做二十个糖
|
|
|
+ LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
|
|
|
+ query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
|
|
|
+
|
|
|
+
|
|
|
+ Calendar todayStart = Calendar.getInstance();
|
|
|
+ todayStart.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
+ todayStart.set(Calendar.MINUTE, 0);
|
|
|
+ todayStart.set(Calendar.SECOND, 0);
|
|
|
+ query.gt(TSugarDo::getCreateDate, todayStart.getTime());
|
|
|
+ Calendar todayEnd = Calendar.getInstance();
|
|
|
+ todayEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
+ todayEnd.set(Calendar.MINUTE, 59);
|
|
|
+ todayEnd.set(Calendar.SECOND, 59);
|
|
|
+ query.le(TSugarDo::getCreateDate, todayEnd.getTime());
|
|
|
+ query.eq(TSugarDo::getStatus, "1");
|
|
|
+ List<TSugarDo> sugarDoList = tSugarDoService.list(query);
|
|
|
+ if (sugarDoList.size() > 20) {
|
|
|
+ return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
|
|
|
+ }
|
|
|
}
|
|
|
StringBuilder number = new StringBuilder();
|
|
|
Random random = new Random();
|
|
@@ -147,24 +154,31 @@ public class TSugarDoController {
|
|
|
if (equipmentId != null) {
|
|
|
TEquipment equipment = tEquipmentService.getById(equipmentId);
|
|
|
Long equipmentAdminId = equipment.getAdminId();
|
|
|
- //判断本日是否已做二十个糖
|
|
|
- LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
|
|
|
- query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
|
|
|
+ // 判断是否是海外账户,海外账户不限制制作数量
|
|
|
+ TAdmin admin = tAdminService.getById(equipmentAdminId);
|
|
|
+ String ifForeign = admin.getIfForeign();
|
|
|
|
|
|
- Calendar todayStart = Calendar.getInstance();
|
|
|
- todayStart.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
- todayStart.set(Calendar.MINUTE, 0);
|
|
|
- todayStart.set(Calendar.SECOND, 0);
|
|
|
- query.gt(TSugarDo::getCreateDate, todayStart.getTime());
|
|
|
- Calendar todayEnd = Calendar.getInstance();
|
|
|
- todayEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
- todayEnd.set(Calendar.MINUTE, 59);
|
|
|
- todayEnd.set(Calendar.SECOND, 59);
|
|
|
- query.le(TSugarDo::getCreateDate, todayEnd.getTime());
|
|
|
- query.eq(TSugarDo::getStatus, "1");
|
|
|
- List<TSugarDo> sugarDoList = tSugarDoService.list(query);
|
|
|
- if (sugarDoList.size() > 20) {
|
|
|
- return R.fail(ResponseCodesEnum.A0001, "今日远程制作数量已满");
|
|
|
+ if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("0")) {
|
|
|
+ //判断本日是否已做二十个糖
|
|
|
+ LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
|
|
|
+ query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
|
|
|
+
|
|
|
+
|
|
|
+ Calendar todayStart = Calendar.getInstance();
|
|
|
+ todayStart.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
+ todayStart.set(Calendar.MINUTE, 0);
|
|
|
+ todayStart.set(Calendar.SECOND, 0);
|
|
|
+ query.gt(TSugarDo::getCreateDate, todayStart.getTime());
|
|
|
+ Calendar todayEnd = Calendar.getInstance();
|
|
|
+ todayEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
+ todayEnd.set(Calendar.MINUTE, 59);
|
|
|
+ todayEnd.set(Calendar.SECOND, 59);
|
|
|
+ query.le(TSugarDo::getCreateDate, todayEnd.getTime());
|
|
|
+ query.eq(TSugarDo::getStatus, "1");
|
|
|
+ List<TSugarDo> sugarDoList = tSugarDoService.list(query);
|
|
|
+ if (sugarDoList.size() > 20) {
|
|
|
+ return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
|
|
|
+ }
|
|
|
}
|
|
|
StringBuilder number = new StringBuilder();
|
|
|
Random random = new Random();
|