|
|
@@ -23,10 +23,7 @@ import org.jeecg.common.exception.JeecgBootException;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.system.util.JwtUtil;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
-import org.jeecg.common.util.CommonUtils;
|
|
|
-import org.jeecg.common.util.TenantContextHolder;
|
|
|
-import org.jeecg.common.util.TokenUtils;
|
|
|
-import org.jeecg.common.util.oConvertUtils;
|
|
|
+import org.jeecg.common.util.*;
|
|
|
import org.jeecg.modules.business.entity.BusHotel;
|
|
|
import org.jeecg.modules.business.service.IBusHotelService;
|
|
|
import org.jeecg.modules.mall.entity.MallUserInfo;
|
|
|
@@ -176,6 +173,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ posTable.setId(UUIDGenerator.generate());
|
|
|
LambdaQueryWrapper<WxAppConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
lambdaQueryWrapper.eq(WxAppConfig::getTenantId, posTable.getTenantId());
|
|
|
WxAppConfig wxApp = wxAppConfigService.getOne(lambdaQueryWrapper);
|
|
|
@@ -190,7 +188,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
|
|
|
WxMaService wxMaService = new WxMaServiceImpl();
|
|
|
wxMaService.setWxMaConfig(configStorage);
|
|
|
|
|
|
- File file = wxMaService.getQrcodeService().createQrcode("page/dc/index?id=", 430);
|
|
|
+ File file = wxMaService.getQrcodeService().createQrcode("page/dc/index?id="+posTable.getId(), 430);
|
|
|
try {
|
|
|
MultipartFile cMultiFile = new MockMultipartFile("file", file.getName(), null, new FileInputStream(file));
|
|
|
String path = CommonUtils.upload(cMultiFile, "temp", CommonConstant.UPLOAD_TYPE_OSS);
|
gqx