易诊通修改

fs-admin/src/main/java/com/fs/his/controller/FsPackageOrderController.java

@@ -141,6 +141,7 @@ public class FsPackageOrderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsPackageOrder fsPackageOrder)
     {
+        logger.info("套餐订单：{}",fsPackageOrder);
         return toAjax(fsPackageOrderService.insertFsPackageOrder(fsPackageOrder));
     }
     @GetMapping("/payment/{orderId}")

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -66,7 +66,7 @@ public interface FsPackageMapper
      */
     public int deleteFsPackageByPackageIds(Long[] packageIds);
 
-    @Select("select package_id dictValue,package_name dictLabel from fs_package where package_sub_type != 3 order by sort")
+    @Select("select package_id dictValue,package_name dictLabel from fs_package order by sort")
     List<OptionsVO> selectAllPackageList();
     @Select({"<script> " +
             "select * from fs_package "+

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

@@ -810,18 +810,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();

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

@@ -712,9 +712,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         //写入订单
         Map<String,Object> packageJson = (Map)JSON.parse(order.getPackageJson());
         Integer packageSubType = (Integer)packageJson.get("packageSubType");
-        if (packageSubType!=3){
-            inquiryOrderService.createOrderByPackageOrder(order);
-        }
+//        if (packageSubType!=3){
+//            inquiryOrderService.createOrderByPackageOrder(order);
+//        }
         if (packageSubType!=1){
             storeOrderService.createOrderByPackageOrder(order);
             logger.info("创建订单");

fs-user-app/src/main/java/com/fs/app/controller/PackageOrderController.java

@@ -19,6 +19,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +30,7 @@ import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
 
+@Slf4j
 @Api("套餐订单接口")
 @RestController
 @RequestMapping(value="/app/packageOrder")
@@ -42,6 +44,8 @@ public class PackageOrderController extends  AppBaseController {
     @ApiOperation("创建订单")
     @PostMapping("/create")
     public R create(@Validated @RequestBody FsPackageOrderCreateParam param, HttpServletRequest request){
+
+        log.info("创建订单 {}",param);
         param.setUserId(Long.parseLong(getUserId()));
         return packageOrderService.createOrder(param);
     }

fs-user-app/src/main/java/com/fs/app/controller/YbPayController.java

@@ -1,5 +1,6 @@
 package com.fs.app.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.spring.SpringUtils;
@@ -10,16 +11,16 @@ import com.fs.his.service.IFsInquiryOrderService;
 import com.fs.his.service.IFsPackageOrderService;
 import com.fs.his.service.IFsStoreOrderService;
 
+import com.fs.his.service.IFsStorePaymentService;
+import com.fs.huifuPay.domain.HuiFuResult;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import com.fs.ybPay.domain.OrderCallback;
 import com.fs.ybPay.util.PayUtil;
 import com.google.gson.Gson;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -43,6 +44,12 @@ public class YbPayController extends BaseController
     private IFsUserCourseOrderService courseOrderService;
     @Autowired
     private IFsUserVipOrderService userVipOrderService;
+
+    @Autowired
+    private IFsStoreOrderService orderService;
+
+    @Autowired
+    private IFsStorePaymentService storePaymentService;
     @PostMapping("/payNotify")
     public String payNotify(@RequestBody Map<String, String> params, @RequestBody OrderCallback o) {
         System.out.println("支付回调");
@@ -79,5 +86,4 @@ public class YbPayController extends BaseController
 
 
 
-
 }