yq 3 роки тому
батько
коміт
71a3325449

+ 10 - 1
src/main/java/com/usky/dxtop/service/impl/QrCodeServiceImpl.java

@@ -16,8 +16,10 @@ import com.usky.dxtop.common.utils.file.FileUtils;
 import com.usky.dxtop.common.utils.sign.Base64;
 import com.usky.dxtop.mapper.QrCodeMapper;
 import com.usky.dxtop.model.QrCode;
+import com.usky.dxtop.model.TopChannel;
 import com.usky.dxtop.service.ISysConfigService;
 import com.usky.dxtop.service.QrCodeService;
+import com.usky.dxtop.service.TopChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,6 +28,7 @@ import org.springframework.util.FastByteArrayOutputStream;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.Optional;
 
 /**
  * <p>
@@ -41,12 +44,18 @@ public class QrCodeServiceImpl extends ServiceImpl<QrCodeMapper, QrCode> impleme
     @Autowired
     private ISysConfigService sysConfigService;
 
+    @Autowired
+    private TopChannelService topChannelService;
+
 
     @Override
     public boolean add(QrCode qrCode) {
         try {
             String s = sysConfigService.selectConfigByKey("app.pay.path");
-            String payPath = String.format("%s%s",s,qrCode.getTopChannelName());
+            Optional.ofNullable(qrCode.getTopChannelId())
+                    .orElseThrow(() ->new CustomException("渠道不能为空"));
+            TopChannel topChannel = topChannelService.getById(qrCode.getTopChannelId());
+            String payPath = String.format("%s%s",s,topChannel.getName());
             //生成二维码
             BufferedImage image = QRCodeUtil.encode(payPath, null, true);
             // 转换流信息写出