add

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

@@ -936,9 +936,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){
             logger.info("创建订单2");
             storeOrderService.createOrderByPackageOrder(order);

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

@@ -1696,7 +1696,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         order.setDeptId(packageOrder.getDeptId());
         order.setCompanyId(packageOrder.getCompanyId());
         order.setCompanyUserId(packageOrder.getCompanyUserId());
-        order.setPackageOrderId(packageOrder.getOrderId());
+      //  order.setPackageOrderId(packageOrder.getOrderId());
         order.setCreateTime(new Date());
         if (packageOrder.getSource() != null) {
             order.setSource(packageOrder.getSource());

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

@@ -47,7 +47,7 @@ public class PackageOrderController extends  AppBaseController {
 
     @Login
     @ApiOperation("创建订单")
-    @PostMapping("/create")
+    @PostMapping("/create1")
     public R create(@Validated @RequestBody FsPackageOrderCreateParam param, HttpServletRequest request){
         param.setUserId(Long.parseLong(getUserId()));
         return packageOrderService.createOrder(param);
@@ -55,7 +55,7 @@ public class PackageOrderController extends  AppBaseController {
 
     @Login
     @ApiOperation("创建订单(疗法版本)")
-    @PostMapping("/create1")
+    @PostMapping("/create")
     public R create1(@Validated @RequestBody FsPackageOrderCreateParam param, HttpServletRequest request){
         param.setUserId(Long.parseLong(getUserId()));
         return packageOrderService.createOrder1(param);