update

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java

@@ -44,6 +44,17 @@ public class PileMerchantInfoController extends BaseController {
 		return getDataTable(list);
 	}
 
+
+	/**
+	 * 查询一级运营商列表
+	 */
+	@PreAuthorize("@ss.hasPermi('pile:merchant:list')")
+	@GetMapping("queryFirstLevelMerchant")
+	public TableDataInfo queryFirstLevelMerchant() {
+		List<PileMerchantInfo> list = pileMerchantInfoService.queryFirstLevelMerchant();
+		return getDataTable(list);
+	}
+
 	/**
 	 * 获取运营商列表 不分页
 	 * @param pileMerchantInfo

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java

@@ -84,4 +84,9 @@ public interface PileMerchantInfoMapper {
 	 * @return
 	 */
 	List<PileMerchantInfo> queryInfoListByIds(@Param("deptIds") List<String> deptIds);
+
+	/**
+	 * 查询一级运营商
+	 */
+	List<PileMerchantInfo> queryFirstLevelMerchant();
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java

@@ -85,4 +85,10 @@ public interface IPileMerchantInfoService {
 	 * @return
 	 */
 	List<PileMerchantInfo> queryInfoListByIds(AuthorizedDeptVO authorizedMap);
+
+	/**
+	 * 查询一级运营商列表
+	 * @return
+	 */
+    List<PileMerchantInfo> queryFirstLevelMerchant();
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -332,4 +332,13 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
 		return null;
 	}
+
+	/**
+	 * 查询一级运营商列表
+	 * @return
+	 */
+	@Override
+	public List<PileMerchantInfo> queryFirstLevelMerchant() {
+		return pileMerchantInfoMapper.queryFirstLevelMerchant();
+	}
 }

jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml

@@ -324,4 +324,13 @@
             </foreach>
         </if>
     </select>
+
+    <select id="queryFirstLevelMerchant" resultMap="PileMerchantInfoResult">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        pile_merchant_info
+        where del_flag = '0'
+        and merchant_level = '1'
+    </select>
 </mapper>

jsowell-ui/src/api/adapayMember/adapayMember.js

@@ -19,7 +19,7 @@ export function selectAdapayMember(data) {
 // 营收报表
 export function getMerchantOrderReport(data) {
   return request({
-    url: '/pile/report/getMerchantOrderReport',
+    url: '/order/report/getMerchantOrderReport',
     method: 'post',
     data: data
   })
@@ -72,4 +72,4 @@ export function withdraw(data) {
         method: 'post',
         data: data
     })
-}
+}

jsowell-ui/src/views/pile/merchant/index.vue

@@ -256,6 +256,32 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="运营商等级" prop="merchantLevel">
+                            <el-select v-model="form.merchantLevel" placeholder="请选择运营商等级">
+                                <el-option
+                                    v-for="item in options"
+                                    :key="item.label"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="上级运营商" prop="parentId">
+                            <el-select v-model="form.parentId" placeholder="请选择上级运营商">
+                                <el-option
+                                    v-for="item in merchantList"
+                                    :key="item.merchantName"
+                                    :label="item.merchantName"
+                                    :value="item.id"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
                 <el-form-item label="公司logo" prop="logoUrl">
                     <el-upload
                         class="upload-demo"
@@ -361,6 +387,13 @@ export default {
                 servicePhone: null,
                 logoUrl: null,
             },
+            options: [{
+                value: '1',
+                label: '一级运营商'
+            }, {
+                value: '2',
+                label: '二级运营商'
+            }],
             // 表单参数
             form: {},
             // 表单校验