Преглед изворни кода

feat:配置默认销售图片

caoliqin пре 2 недеља
родитељ
комит
98ea05d8d9

+ 0 - 16
fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -348,20 +348,4 @@ public class FsUserController extends AppBaseController {
         userCourseCountService.insertFsUserCourseCountTask();
     }
 
-//    public static void main(String[] args) throws IOException, WriterException {
-//
-//    }
-
-    @GetMapping("/qrcode")
-    public byte[] test() throws IOException, WriterException{
-        QRCodeWriter qrCodeWriter = new QRCodeWriter();
-        BitMatrix bitMatrix = qrCodeWriter.encode("chenys_only", BarcodeFormat.QR_CODE, 200, 200);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream);
-        System.out.println(Arrays.toString(outputStream.toByteArray()));
-        return outputStream.toByteArray();
-    }
-
-
-
 }

+ 1 - 0
fs-service-system/src/main/java/com/fs/course/config/CourseConfig.java

@@ -27,6 +27,7 @@ public class CourseConfig implements Serializable {
     private BigDecimal moneyPri;//充值手续费百分比
     private BigDecimal redPackageMoney;//充值手续费百分比
     private List<DisabledTimeVo> disabledTimeList;//充值手续费百分比
+    private String companyUserQRCode;// 默认客服二维码图片
 
     @Data
     public static class DisabledTimeVo{

+ 14 - 2
fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -940,13 +940,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         //2、如果只绑定了当前销售,需要添加看课记录(正常流程);
         //3、以上都不是,则标识重粉,需要加入关系表,并打上重粉标签
         if(fsUser.getCompanyUserId() == null) {
-            return ResponseResult.fail(BizResponseEnum.DATA_NOT_EXIST,companyUser.getQrCodeWeixin());
+            return ResponseResult.fail(BizResponseEnum.DATA_NOT_EXIST, getCompanyUserQRCode(companyUser));
         }
 
         // 如果开启了黑名单审核,需要提示
         if(fsUser.getStatus() == 0) {
 //            return ResponseResult.fail(505, "管理开启了会员审核,请等待审核");
-            return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,companyUser.getQrCodeWeixin());
+            return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,getCompanyUserQRCode(companyUser));
         }
 
         //查询看课记录
@@ -1005,6 +1005,18 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         return ResponseResult.ok(Boolean.TRUE);
     }
 
+    private String getCompanyUserQRCode(CompanyUser companyUser) {
+        String companyUserQRCode;
+        if(StringUtils.isNotEmpty(companyUser.getQrCodeWeixin())){
+             companyUserQRCode = companyUser.getQrCodeWeixin();
+        } else {
+            String json = configService.selectConfigByKey("course.config");
+            CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+             companyUserQRCode = config.getCompanyUserQRCode();
+        }
+        return companyUserQRCode;
+    }
+
     @Override
     public ResponseResult<FsUserCourseVideoLinkDetailsVO> getLinkCourseVideoDetails(FsUserCourseVideoLinkParam param) {
 //        FsUserCoursePeriodDays periodDays = new FsUserCoursePeriodDays();