支付相关

fs-service/src/main/resources/mapper/his/FsStorePaymentMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsStorePaymentVo">
-        select payment_id, pay_code,is_share,share_status,share_code,share_money,business_code,pay_mode, pay_type_code,company_id,company_user_id, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_id, status, remark, bank_transaction_id, bank_serial_no, refund_money, refund_time, store_id,app_id from fs_store_payment
+        select payment_id, pay_code,is_share,share_status,share_code,share_money,business_code,pay_mode, pay_type_code,company_id,company_user_id, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_id, status, remark, bank_transaction_id, bank_serial_no, refund_money, refund_time, store_id,app_id,merchant_id from fs_store_payment
     </sql>
 
     <select id="selectFsStorePaymentList" parameterType="FsStorePayment" resultMap="FsStorePaymentResult">

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

@@ -352,7 +352,8 @@ public class InquiryOrderController extends  AppBaseController {
 //            }
 //        }
 
-        if ((!"appPay".equals(merchantAppConfig.getMerchantType()) && (StringUtils.isBlank(openId) || ("hf".equals(merchantAppConfig.getMerchantType()) && "wx".equals(param.getPayType())) ))) {
+
+        if ("hf".equals(merchantAppConfig.getMerchantType()) && "wx".equals(param.getPayType()) && StringUtils.isBlank(openId)) {
             return R.error("用户OPENID不存在");
         }