问诊代客下单生成付款二维码

fs-company/src/main/java/com/fs/company/controller/store/FsInquiryOrderController.java

@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -362,4 +363,17 @@ public class FsInquiryOrderController extends BaseController
     }
 
 
+    /**
+    * 生成订单二维码
+    */
+    @PreAuthorize("@ss.hasPermi('store:inquiryOrder:wxaCodeInquiryOrder')")
+    @GetMapping("/getWxaCodeInquiryOrderUnLimit/{orderId}")
+    public AjaxResult getWxaCodeInquiryOrderUnLimit(@PathVariable("orderId") Long orderId)
+    {
+
+        byte[] bytes = fsInquiryOrderService.getWxaCodeInquiryOrderUnLimit(orderId);
+        String base64 = Base64.getEncoder().encodeToString(bytes);
+        return AjaxResult.success("成功",base64);
+
+    }
 }

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -12,6 +12,8 @@ import com.fs.course.service.IFsCourseLinkService;
 import com.fs.course.service.IFsCourseWatchLogService;
 import com.fs.course.service.IFsUserVideoService;
 import com.fs.course.service.IHuaweiObsService;
+import com.fs.his.service.IFsInquiryOrderService;
+import com.fs.his.service.IFsPackageOrderService;
 import com.fs.qw.mapper.QwExternalContactMapper;
 import com.fs.qw.service.IQwExternalContactService;
 import com.fs.qwApi.service.QwApiService;
@@ -34,6 +36,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
 
 @Api("公共接口")
@@ -93,6 +96,9 @@ public class CommonController {
     @Autowired
     private ISopUserLogsInfoService iSopUserLogsInfoService;
 
+    @Autowired
+    private IFsInquiryOrderService inquiryOrderService;
+
 
     /**
     * 发官方通连
@@ -133,8 +139,9 @@ public class CommonController {
     @GetMapping("/testSop")
     public R testSop() throws Exception {
 
-        List<ExtCourseSopWatchLogVO> tagList = iSopUserLogsInfoService.getExtCourseSopWatchLog(14185L);
-        return R.ok().put("data",tagList);
+        byte[] bytes = inquiryOrderService.getWxaCodeInquiryOrderUnLimit(2582616L);
+        String base64 = Base64.getEncoder().encodeToString(bytes);
+        return R.ok().put("data",base64);
     }
 
     @GetMapping("/testRatingSop")

fs-service/src/main/java/com/fs/his/service/IFsInquiryOrderService.java

@@ -126,4 +126,6 @@ public interface IFsInquiryOrderService
     void exportData(FsInquiryOrderParam fsInquiryOrder);
 
     void exportFeedbackData(FsInquiryOrderParam fsInquiryOrder);
+
+    byte[] getWxaCodeInquiryOrderUnLimit(Long orderId);
 }

fs-service/src/main/java/com/fs/his/service/IFsPackageOrderService.java

@@ -120,4 +120,6 @@ public interface IFsPackageOrderService
     FsPackage selectFsPackageByOrderId(Long packageOrderId);
 
     List<PackageOrderDTO> getNewOrder();
+
+
 }

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -28,12 +28,15 @@ import com.fs.core.utils.OrderCodeUtils;
 import com.fs.event.TemplateBean;
 import com.fs.event.TemplateEvent;
 import com.fs.event.TemplateListenEnum;
+import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.*;
 import com.fs.his.dto.*;
 import com.fs.his.enums.FsInquiryOrderStatusEnum;
 import com.fs.his.mapper.*;
 import com.fs.his.param.*;
 import com.fs.his.service.*;
+import com.fs.his.utils.ConfigUtil;
+import com.fs.his.utils.HttpUtil;
 import com.fs.his.vo.*;
 import com.fs.huifuPay.domain.HuiFuRefundResult;
 import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentScanpayRefundRequest;
@@ -60,6 +63,7 @@ import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import lombok.Synchronized;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -165,7 +169,8 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
     private IFsUserCouponService userCouponService;
     @Autowired
     private IFsCouponService couponService;
-
+    @Autowired
+    private ConfigUtil configUtil;
     /**
      * 查询问诊订单
      *
@@ -810,18 +815,18 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                 String redisKey = String.valueOf(StrUtil.format("{}{}", FsConstants.REDIS_INQUIRY_ORDER_OUTTIME_UNRECEIVE, order.getOrderId()));
                 redisCache.setCacheObject(redisKey,order.getOrderId(),configDTO.getUnReceiveCancelTime(), TimeUnit.MINUTES);
             }
-            try {
-                new Thread(() -> {
-                    try {
-                        rocketMQTemplate.syncSend("repeat-upload", JSON.toJSONString(RepeatUploadVo.builder().type(2).fsUserId(order.getUserId()).build()));
-                    }catch (Exception e){
-                        logger.error("看课重粉提交mq失败", e);
-                    }
-                }).start();
-
-            }catch (Exception e){
-                logger.error("看课重粉提交mq失败", e);
-            }
+//            try {
+//                new Thread(() -> {
+//                    try {
+//                        rocketMQTemplate.syncSend("repeat-upload", JSON.toJSONString(RepeatUploadVo.builder().type(2).fsUserId(order.getUserId()).build()));
+//                    }catch (Exception e){
+//                        logger.error("看课重粉提交mq失败", e);
+//                    }
+//                }).start();
+//
+//            }catch (Exception e){
+//                logger.error("看课重粉提交mq失败", e);
+//            }
 
 
             return R.ok();
@@ -1766,4 +1771,26 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         task.setFileUrl(result.get("msg").toString());
         fsExportTaskMapper.updateFsExportTask(task);
     }
+
+    @Override
+    public byte[] getWxaCodeInquiryOrderUnLimit(Long orderId) {
+        FsSysConfig sysConfig = configUtil.getSysConfig();
+        String url="https://api.weixin.qq.com/cgi-bin/stable_token";
+        HashMap<String, String> map = new HashMap<>();
+        map.put("grant_type","client_credential");
+        map.put("appid",sysConfig.getAppid());
+        map.put("secret",sysConfig.getSecret());
+
+
+        String accessToken = HttpUtil.endApi(url, null, map);
+        Map<String, String> accessTokenMap  = new Gson().fromJson(accessToken, new TypeToken<Map<String, Object>>(){}.getType());
+        String codeUrl="https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="+accessTokenMap.get("access_token");
+        HashMap<String, String> jsonMap = new HashMap<>();
+        jsonMap.put("page","pages_order/inquiryPay");
+        jsonMap.put("scene","orderId="+ orderId);
+        //正式版为 "release"，体验版为 "trial"，开发版为 "develop"
+        jsonMap.put("env_version","release");
+        byte[] bytes = HttpUtil.getWechatQrcodeByHttpURL(codeUrl, jsonMap);
+        return bytes;
+    }
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -726,23 +726,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             u.setIsBuy(1);
             fsUserService.updateFsUser(u);
         }
-        //新用户首次下单公域成功
-//        if (order.getCompanyUserId()==null){
-//            fsUserNewTaskService.performTaskThree(fsUser.getUserId(),fsUser.getIntegral(),order.getOrderId());
-//        }
         return R.ok();
-//        }catch (Exception e){
-//            logger.info("台州银行支付错误:"+e.getMessage());
-//            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
-//            FsStorePaymentError err = new FsStorePaymentError();
-//            err.setOrderNo(orderSn);
-//            err.setOrderFlowNo(tradeNo);
-//            err.setStatus(0);
-//            err.setMsg(e.getMessage());
-//            err.setCreateTime(DateUtils.getNowDate());
-//            fsStorePaymentErrorMapper.insertFsStorePaymentError(err);
-//            return R.error();
-//        }
     }
 
     @Override

fs-service/src/main/resources/application-config-druid-xfk.yml

@@ -60,8 +60,8 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://172.16.0.16:8010
-  h5CommonApi: http://119.29.195.254:8010
+  commonApi: http://127.0.0.1:8010
+  h5CommonApi: http://127.0.0.1:8010
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16