Merge remote-tracking branch 'remotes/origin/developer' into developerB

pay/src/main/java/com/caimei/module/pay/dao/PayDao.java

@@ -59,4 +59,9 @@ public interface PayDao {
      * @param balanceRecord
      */
     void insertBalanceRecord(BalanceRecordVo balanceRecord);
+
+    /**
+     * 获取线上支付开关状态
+     */
+    Integer getPayOnLineSwitch();
 }

pay/src/main/java/com/caimei/module/pay/service/PayService.java

@@ -15,6 +15,12 @@ import java.io.IOException;
  * @date : 2020/5/9
  */
 public interface PayService {
+    /**
+     * 获取线上支付开关状态
+     * @return
+     */
+    JsonModel getPayOnLineSwitch();
+
     /**
      * 收银台数据
      *

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -67,6 +67,17 @@ public class PayServiceImpl implements PayService {
 
     JsonModel model = JsonModel.newInstance();
 
+    /**
+     * 获取线上支付开关状态
+     *
+     * @return
+     */
+    @Override
+    public JsonModel getPayOnLineSwitch() {
+        Integer status = payDao.getPayOnLineSwitch();
+        return model.success(status);
+    }
+
     @Override
     public JsonModel checkoutCounter(Integer orderId) {
         if (null == orderId) {

pay/src/main/resources/com-caimei-module-pay/PayMapper.xml

@@ -353,9 +353,9 @@
 
     <select id="fandAllOrderProduct" resultType="com.caimei.module.base.entity.vo.OrderProductVo">
         SELECT
-          cop.*,
-          p.includedTax,
-          p.invoiceType
+            p.invoiceType,
+            p.includedTax,
+            cop.*
         FROM
           cm_order_product cop
           LEFT JOIN product p ON cop.productID = p.productID
@@ -371,6 +371,9 @@
         WHERE
           userID = #{userID}
     </select>
+    <select id="getPayOnLineSwitch" resultType="java.lang.Integer">
+        select status from cm_pay_online_switch where id=1
+    </select>
 
     <update id="updateSeconHand">
         UPDATE
@@ -426,4 +429,4 @@
             #{delFlag}
           )
     </insert>
-</mapper>
+</mapper>