Merge remote-tracking branch 'origin/master'

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

@@ -219,6 +219,12 @@ public interface FsStoreOrderMapper
             "            <if test=\"maps.packageSecondName != null and maps.packageSecondName != '' \"> and so.package_second_name like concat('%', #{maps.packageSecondName}, '%')</if>"+
             "            <if test=\"maps.storeId != null \"> and so.store_id = #{maps.storeId}</if>\n" +
             "            <if test=\"maps.orderCode != null  and maps.orderCode != ''\"> and so.order_code = #{maps.orderCode}</if>\n" +
+            "            <if test=\"maps.orderCodes != null  and maps.orderCodes.size > 0\">\n" +
+            "                and so.order_code in\n" +
+            "                <foreach collection=\"maps.orderCodes\" item=\"orderCode\" open=\"(\" close=\")\" separator=\",\">\n" +
+            "                    #{orderCode}\n" +
+            "                </foreach>\n" +
+            "            </if>" +
             "            <if test=\"maps.prescribeCode != null  and maps.prescribeCode != ''\"> and p.prescribe_code = #{maps.prescribeCode}</if>\n" +
             "            <if test=\"maps.userName != null  and maps.userName != ''\"> and so.user_name like concat('%', #{maps.userName}, '%')</if>\n" +
             "            <if test=\"maps.userPhone != null  and maps.userPhone != ''\"> and so.user_phone = #{maps.userPhone}</if>\n" +

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

@@ -181,7 +181,18 @@ public interface FsStorePaymentMapper
     @Select("select * from fs_store_payment where business_type=#{type} and  business_id=#{businessId} and (status=1 or starus=-1)")
     List<FsStorePayment> selectFsStorePaymentByPayOrRefund(int i, Long orderId);
     @Select({"<script> " +
-            " SELECT CONCAT('package-', sp.pay_code) AS pay_code,sp.*,u.nick_name,u.phone,s.store_name,c.company_name,cu.nick_name as companyUserName,fso.delivery_name,fso.package_name,fso.package_second_name ,csc.name miniProgramName " +
+            " SELECT " +
+            " CASE " +
+            "   WHEN sp.business_type = 1 THEN CONCAT('inquiry-', sp.pay_code) " +
+            "   WHEN sp.business_type = 2 THEN CONCAT('store-', sp.pay_code) " +
+            "   WHEN sp.business_type = 3 THEN CONCAT('package-', sp.pay_code) " +
+            "   WHEN sp.business_type = 4 THEN CONCAT('course-', sp.pay_code) " +
+            "   WHEN sp.business_type = 5 THEN CONCAT('appvip-', sp.pay_code) " +
+            "   WHEN sp.business_type = 6 THEN CONCAT('integral-', sp.pay_code) " +
+            "   WHEN sp.business_type = 7 THEN CONCAT('payment-', sp.pay_code) " +
+            "   ELSE sp.pay_code " +
+            " END AS pay_code, " +
+            "sp.*,u.nick_name,u.phone,s.store_name,c.company_name,cu.nick_name as companyUserName,fso.delivery_name,fso.package_name,fso.package_second_name ,csc.name miniProgramName " +
             " FROM fs_store_payment sp " +
             " LEFT JOIN  fs_user u ON u.user_id=sp.user_id " +
             " LEFT JOIN fs_store s ON s.store_id=sp.store_id " +