merge

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -135,6 +135,16 @@ public class SysTenantController extends BaseController {
         return toAjax(iSysTenantService.deleteTopTenant(bo) ? 1 : 0);
     }
 
+    /**
+     * 查询系统商户列表
+     */
+    @ApiOperation("查询系统商户列表")
+    @GetMapping("/top/list")
+    public AjaxResult<List<SysTenantVo>> getTopListAll(SysTenantQueryBo bo) {
+        List<SysTenantVo> list = iSysTenantService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 删除系统商户
      */

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -154,18 +154,18 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldOrder:
-    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
-    refundPay: http://192.168.1.222:6030/common/platform/pay
-    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://gdxypx.xy.com/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://gdxypx.xy.com/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:5030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:5030/common/platform/pay/handle
 
 oldSys:
     host: http://gdxypx.xy.com
 
 invoice:
-    host: http://192.168.1.222:8077/sys/common/openMplatform/log
+    host: http://192.168.1.222:7077/sys/common/openMplatform/log

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -97,6 +97,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         LambdaQueryWrapper<SysTenant> lqw = Wrappers.lambdaQuery();
         lqw.ne(SysTenant::getStatus, -1);
         lqw.like(StrUtil.isNotBlank(bo.getTenantName()), SysTenant::getTenantName, bo.getTenantName());
+        lqw.eq(ObjectUtils.isNotNull(bo.getTenantid()),SysTenant::getTenantId, bo.getTenantid());
         return entity2Vo(this.list(lqw));
     }
 
@@ -444,6 +445,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         add.setTenantId(createTenantId());
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setStatus(1);
         if (ObjectUtils.isNotNull(bo.getAccountList())){
             add.setAccountInformation(JSONArray.toJSONString(bo.getAccountList()));
         }
@@ -463,6 +465,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 //        if(checkNameUnique(tenant)){
 //            throw new CustomException("公司名已存在");
 //        }
+        tenant.setHostH5(bo.getHostH5());
+        tenant.setHostPc(bo.getHostPc());
         tenant.setBillType(bo.getBillType());
         tenant.setBillDay(bo.getBillDay());
         tenant.setAccountInformation(JSONArray.toJSONString(bo.getAccountList()));

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantQueryBo.java

@@ -35,6 +35,8 @@ public class SysTenantQueryBo extends BaseEntity {
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
+	@ApiModelProperty("机构ID")
+	private Long tenantid;
 
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 失效 1启用")

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTopTenantEditBo.java

@@ -28,6 +28,12 @@ public class SysTopTenantEditBo {
     @NotNull(message = "名称不能为空")
     private String tenantName;
 
+    @ApiModelProperty("")
+    private String hostH5;
+
+    @ApiModelProperty("")
+    private String hostPc;
+
     @ApiModelProperty("账单类型 (1月份 2季度 3半年 4年度)")
     private Integer billType;
 

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -90,6 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="creditStatus != null and creditStatus == 1">
             AND vto.pay_price = vto.order_received
         </if>
+        <if test="finishStatus != null">
+            AND vto.finish_status = #{finishStatus}
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">
             AND vto.invoice_status = #{invoiceStatus}
         </if>
@@ -102,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderSn != null and orderSn != ''">
             AND vto.order_sn = #{orderSn}
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND vto.tenant_id = #{tenantId}
+        </if>
         <if test="orderSnList != null and orderSnList.size()!=0 ">
             AND vto.order_sn in
             <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
@@ -110,8 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="keyword != null and keyword != ''">
             AND (
-            vto.create_org LIKE CONCAT( '%', #{keyword}, '%' )
---             OR vto.course_org LIKE CONCAT( '%', #{keyword}, '%' )
+            vto.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
+            OR vto.create_no LIKE CONCAT( '%', #{keyword}, '%' )
             OR vto.order_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
         order by vto.create_time DESC
@@ -160,6 +166,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderSn != null and orderSn != ''">
             AND ot.order_sn = #{orderSn}
         </if>
+        <if test="finishStatus != null">
+            AND ot.finish_status = #{finishStatus}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND ot.tenant_id = #{tenantId}
+        </if>
         <if test="orderSnList != null and orderSnList.size()!=0 ">
             AND ot.order_sn in
             <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
@@ -168,7 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="keyword != null and keyword != ''">
             AND (
-            ot.create_org LIKE CONCAT( '%', #{keyword}, '%' )
+            ot.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
+            OR ot.create_no LIKE CONCAT( '%', #{keyword}, '%' )
             OR ot.order_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
             ) + (SELECT
@@ -213,6 +226,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="invoiceStatus != null and invoiceStatus != ''">
             AND o.invoice_status = #{invoiceStatus}
         </if>
+        <if test="finishStatus != null">
+            AND o.finish_status = #{finishStatus}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND o.tenant_id = #{tenantId}
+        </if>
         <if test="startTime != null and startTime != ''">
             AND o.create_time <![CDATA[ >= ]]> #{startTime}
         </if>
@@ -227,6 +246,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
+        </if>
+        <if test="keyword != null and keyword != ''">
+            AND o.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
         </if>
                 )) as number
     </select>