修改支付方式

platform-admin/src/main/java/com/platform/controller/TbCfFinanceController.java

@@ -222,4 +222,14 @@ public class TbCfFinanceController {
 
         return R.ok().put("list", list);
     }
+    /**
+     * 查看支付方式
+     */
+    @RequestMapping("/queryPayWayCodeAll")
+    @ResponseBody
+    public R queryPayWayCodeAll() {
+        Map<String,Object> map=new HashMap<>();
+        List<TbCfFinanceEntity> list = tbCfFinanceService.queryPayWayCodeList(map);
+        return R.ok().put("list", list);
+    }
 }

platform-admin/src/main/java/com/platform/dao/TbCfFinanceDao.java

@@ -4,6 +4,7 @@ import com.platform.entity.TbCfFinanceEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 财务明细Dao
@@ -60,4 +61,11 @@ public interface TbCfFinanceDao extends BaseDao<TbCfFinanceEntity> {
      * @return
      */
     Double findByAvgOrderPrice(@Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     * 查看所有支付方式
+     * @param map
+     * @return
+     */
+    List<TbCfFinanceEntity> queryPayWayCodeList(Map<String, Object> map);
 }

platform-admin/src/main/java/com/platform/service/TbCfFinanceService.java

@@ -119,4 +119,5 @@ public interface TbCfFinanceService {
     Double findByAvgOrderPrice(@Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
 
+    List<TbCfFinanceEntity> queryPayWayCodeList(Map<String, Object> map);
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfFinanceServiceImpl.java

@@ -120,5 +120,10 @@ public class TbCfFinanceServiceImpl implements TbCfFinanceService {
         return tbCfFinanceDao.findByAvgOrderPrice(beginTime,endTime);
     }
 
+    @Override
+    public List<TbCfFinanceEntity> queryPayWayCodeList(Map<String, Object> map) {
+        return tbCfFinanceDao.queryPayWayCodeList(map);
+    }
+
 
 }

platform-admin/src/main/resources/com/platform/dao/TbCfFinanceDao.xml

@@ -54,6 +54,10 @@
 	WHERE order_status IN (20,40,50,60) AND  deal_time BETWEEN #{beginTime} AND #{endTime}
 	</select>
 
+	<!-- 查看所有支付方式-->
+	<select id="queryPayWayCodeList"  resultType="map">
+		select distinct  pay_way_code from tb_cf_finance
+	</select>
 	<select id="queryObject" resultType="com.platform.entity.TbCfFinanceEntity">
 		select
 			`finace_id`,

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html

@@ -58,14 +58,12 @@
                             :value="item.value">
                     </el-option>
                 </el-select>
-                <el-select v-model="payWayCode" placeholder="支付方式">
-                    <el-option
-                            v-for="item in payWayCodeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
+
+                    <el-select  v-model="payWayCode" placeholder="支付方式">
+                        <el-option
+                                v-for="(el,i) in payWayCodeList" :key = 'el.pay_way_code'
+                                :value="el.pay_way_code">{{el.pay_way_code}}</el-option>
+                    </el-select>
                 <i-button type="success" @click="queryAll">查询</i-button>
                 <i-button type="warning" @click="reloadSearch">重置</i-button>
             </div>

platform-admin/src/main/webapp/js/sys/tbcforder.js

@@ -328,8 +328,8 @@ let vm = new Vue({
         reload: function (event) {
             vm.showList = true;
             let orderNo=vm.orderNo;
-            let start=vm.value[0];
-            let end=vm.value[1];
+            let start=vm.value[0]|| null;
+            let end=vm.value[1]|| null;
             let payStatus=vm.payStatus;
             let deliveryFlag=vm.deliveryFlag;
             let orderStatus=vm.orderStatus;

platform-admin/src/main/webapp/js/sys/tbcforderList.js

@@ -45,6 +45,10 @@ $(function () {
             }
         }*/
     });
+    $.get('../tbcffinance/queryPayWayCodeAll',function (res) {
+        vm.payWayCodeList=JSON.parse(res).list;
+        console.log(vm.payWayCodeList)
+    })
 });
 
 let vm = new Vue({
@@ -69,19 +73,6 @@ let vm = new Vue({
             value: '50',
             label: '买家已签收'
         }],
-        payWayCodeOptions:[{
-            value:'0',
-            label:'未支付',
-        },{
-            value:'stripe',
-            label:'stripe',
-        },{
-            value:'paypal',
-            label:'paypal',
-        },{
-            value:'flutterWave',
-            label:'flutterWave',
-        }],
         deliveryFlag:'',
         payWayCode:'',
         pickerOptions: {
@@ -119,6 +110,7 @@ let vm = new Vue({
         orderId:'',
         orderNo:'',
         value:'',
+        payWayCodeList:[]
     },
     methods: {
         queryAll: function () {
@@ -181,8 +173,8 @@ let vm = new Vue({
         },*/
         reload: function (event) {
             vm.showList = true;
-            let start=vm.value[0];
-            let end=vm.value[1];
+            let start=vm.value[0] || null;
+            let end=vm.value[1] || null;
             let payWayCode=vm.payWayCode;
             let deliveryFlag=vm.deliveryFlag;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');