修复处方药流程问题和支付校验

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -4022,10 +4022,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 storeOrder.setPayPrice(dto.getPayPrice());
             }
             storeOrder.setOrderCreateType(param.getOrderCreateType());
-//            long prescribe = carts.stream().filter(item -> item.getProductType() != null && item.getProductType() == 2).count();
-//            if (prescribe > 0) {
-//                storeOrder.setIsPrescribe(1);
-//            }
+            long prescribe = carts.stream().filter(item -> item.getProductType() != null && item.getProductType() == 2).count();
+            if (prescribe > 0) {
+                storeOrder.setIsPrescribe(1);
+            }
 
             storeOrder.setCombinationOrderId(param.getCombinationOrderId());
 

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -1465,8 +1465,7 @@ public class StoreOrderScrmController extends AppBaseController {
         Map<Long, Long> prescriptionCountMap = orderService.batchGetPrescriptionDrugCount(orderIds);
         if(prescriptionCountMap != null){
             for (FsStoreOrderScrm order : orders) {
-                System.out.println(prescriptionCountMap.containsKey(BigInteger.valueOf(order.getId())));
-                if (prescriptionCountMap.containsKey(BigInteger.valueOf(order.getId())) && (order.getIsPrescribe() == null || order.getIsPrescribe() < 1)) {
+                if (prescriptionCountMap.containsKey(BigInteger.valueOf(order.getId())) && order.getPrescribeId() == null) {
                     return "处方订单未开具，无法支付！";
                 }
             }