|
|
@@ -93,6 +93,12 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
|
|
|
InsAreaCompany insAreaCompany =
|
|
|
insAreaCompanyService.getOne(new LambdaQueryWrapper<InsAreaCompany>().eq(InsAreaCompany::getId,
|
|
|
companyId));
|
|
|
+ //是否直接存储二维码
|
|
|
+ Boolean isWx = false;
|
|
|
+ //太平洋则直接存储base64的信息
|
|
|
+ if("TPIC1000000".equals(insAreaCompany.getCompanyId())){
|
|
|
+ isWx = true;
|
|
|
+ }
|
|
|
//查询 是否有数据存在
|
|
|
InsOrderQrCode insOrderQrCode = baseMapper.selectOne(new LambdaQueryWrapper<InsOrderQrCode>()
|
|
|
.eq(InsOrderQrCode::getAreaCompanyId, companyId)
|
|
|
@@ -103,8 +109,7 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
|
|
|
if (Objects.isNull(insAreaCompany.getPaymentLink())) {
|
|
|
throw new SystemException("该订单没有缴费链接");
|
|
|
}
|
|
|
- boolean save = save(insAreaCompany.getOrderno(), insAreaCompany.getId(),
|
|
|
- insAreaCompany.getPaymentLink());
|
|
|
+ boolean save = save(insAreaCompany.getOrderno(), insAreaCompany.getId(), insAreaCompany.getPaymentLink(),isWx);
|
|
|
insOrderQrCode = baseMapper.selectOne(new LambdaQueryWrapper<InsOrderQrCode>()
|
|
|
.eq(InsOrderQrCode::getAreaCompanyId, companyId)
|
|
|
.eq(InsOrderQrCode::getQrcodeStatus, 1));
|
|
|
@@ -178,7 +183,7 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public boolean save(String orderno, String companyId, String jumlUrl) {
|
|
|
+ public boolean save(String orderno, String companyId, String jumlUrl,Boolean isWx) {
|
|
|
try {
|
|
|
InsOrderQrCode insOrderQrCode = new InsOrderQrCode();
|
|
|
|
|
|
@@ -187,7 +192,7 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
|
|
|
insOrderQrCode.setOrderno(orderno);
|
|
|
insOrderQrCode.setAreaCompanyId(companyId);
|
|
|
//判断jumlUrl是base64 还是 url
|
|
|
- if (isHttpUrl(jumlUrl)) {
|
|
|
+ if(isHttpUrl(jumlUrl) || isWx){
|
|
|
insOrderQrCode.setJumpUrl(jumlUrl);
|
|
|
} else {
|
|
|
//base64 二维码图片
|