Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/param/WorkOrderZfireParam.java

@@ -21,4 +21,7 @@ public class WorkOrderZfireParam extends ZfireParamBean {
     @ApiModelProperty("配件申请状态")
     private String partsApplyStatus;
 
+    @ApiModelProperty("查询待支付辅材订单")
+    private Boolean isWait;
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/SettlementPgOrderVO.java

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.bean.worker;
 
+import com.gree.mall.manager.annotation.ZfireField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.util.Date;
 @Data
 public class SettlementPgOrderVO {
 
-    @ApiModelProperty(value = "所属公司 （S9219801广州，S9219807佛山）")
+    @ApiModelProperty(value = "所属公司")
     private String belongCompany;
 
     @ApiModelProperty(value = "所属公司编号")
@@ -45,24 +46,31 @@ public class SettlementPgOrderVO {
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "总工单数（单）")
     private Integer zgds;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "设备总台数（台）")
     private Integer sbzts;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付工单数量（台）")
     private Integer dzzfs;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付设备总台数（台）")
     private Integer dzzfsbts;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付总金额（台）")
     private Integer dzzfzje;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付平均费用（元/台）")
     private Integer dzzfpjfy;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付总平均费用（元/台）")
     private Integer dzzfzpjfy;
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -223,7 +223,9 @@ public interface CommonMapper {
     public IPage<OrderBaseVO> orderBaseList(IPage page,
                                             @Param("ex") WorkOrderZfireParam zfireParamBean,
                                             @Param("adminUserType") Integer adminUserType
-            ,@Param("companyWechatId") String companyWechatId);
+            ,@Param("companyWechatId") String companyWechatId,
+            @Param("orderBaseId") List<String> orderBaseId
+                                            );
 
     /**
      * 考核项目配件列表

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.websit.*;
+import com.gree.mall.manager.bean.worker.SettlementPgOrderVO;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,12 @@ public interface WebsitSalesRetCMapper {
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
+
+
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
+    IPage<SettlementPgOrderVO> pgOrderList(Page page,
+                                           @Param("ex") ZfireParamBean zfireParam,
+                                           @Param("overTime") String overTime,
+                                           @Param("overEndTime") String overEndTime
+                                              );
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -192,8 +192,6 @@ public class PolicyOrderLogic {
             SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictValue, row.get(0))
                     .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
 
-            if (policyOrder == null)
-                throw new RemoteServiceException((String) row.get(1)+"网点下工程师未找到"+(String) row.get(6));
 
 
             if (policyOrder != null) {
@@ -236,6 +234,8 @@ public class PolicyOrderLogic {
                 policyOrder.setBuyUnitId(sysDictCompany.getDictCode());
 
 
+
+
                 if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
                     policyOrder.setPolicyOrderStatus("BZZ");
                 else if (new Date().after(policyOrder.getEndTime()))
@@ -285,6 +285,10 @@ public class PolicyOrderLogic {
                 policyOrderup.setBuyUnit(sysDictCompany.getDictValue());
                 policyOrderup.setBuyUnitId(sysDictCompany.getDictCode());
 
+                policyOrderup.setClassWebsitId((String)row.get(11));
+                policyOrderup.setClassWebsitName((String)row.get(12));
+                policyOrderup.setPayAmount(Convert.toBigDecimal(row.get(8)));
+
 
                 if (new Date().after(policyOrderup.getStartTime()) && new Date().before(policyOrderup.getEndTime()))
                     policyOrderup.setPolicyOrderStatus("BZZ");

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -798,8 +798,19 @@ public class SettlementOrderLogic {
     }
 
     public IPage<SettlementPgOrderVO> pgOrder(WorkerParamBean zfireParamBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, SettlementPgOrderVO.class, adminUser);
+        IPage<SettlementPgOrderVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pgOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParam,
+                zfireParamBean.getOverTime(),
+                zfireParamBean.getOverEndTime()
+               );
+
+        return settlementOrderLogicVOIPage;
 
-        return new Page<>();
     }
 
 /*

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -76,6 +76,7 @@ public class OrderBaseEsLogic {
 
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
+
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             List<QueryBuilder> should = queryBuilder.should();
             if (adminUser.getType().equals(1)) {
@@ -88,6 +89,26 @@ public class OrderBaseEsLogic {
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
         this.montage(queryBuilder1,zfireParamBean);
 
+        List<String> orderBaseId = new ArrayList<>();
+
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+            List<String> collect = workerOrderService.lambdaQuery()
+                    .eq(WorkerOrder::getPayStatus, "WAIT")
+                    .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
+                    .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                return new Page<>();
+
+            orderBaseId.addAll(orderBaseId);
+
+
+        }
+
+        if (!CollectionUtils.isEmpty(orderBaseId)){
+            queryBuilder.must(QueryBuilders.termsQuery("id",orderBaseId));
+        }
+
 
 
         NativeSearchQuery build = new NativeSearchQueryBuilder()

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -110,13 +110,29 @@ public class OrderBaseLogic {
 
         }
 
+        List<String> orderBaseId = new ArrayList<>();
+
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+            List<String> collect = workerOrderService.lambdaQuery()
+                    .eq(WorkerOrder::getPayStatus, "WAIT")
+                    .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
+                    .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                return new Page<>();
+
+            orderBaseId.addAll(orderBaseId);
+
+
+        }
+
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         FieldUtils.supplyParam(zfireParamBean, OrderBaseVO.class, commonLogic.getAdminUser());
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
         IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
-                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null);
+                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null,orderBaseId);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -351,6 +351,14 @@
         <if test="ex.isYb != null and ex.isYb == true">
             and a.pg_incre_item_id !=''
         </if>
+
+        <if test="orderBaseId != null and orderBaseId.size > 0 ">
+        AND
+        a.id IN
+        <foreach item="item" index="index" collection="orderBaseId" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0 and adminUserType != null and adminUserType == 0">
             AND (
                 a.websit_id IN

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -171,4 +171,8 @@
         </if>
         ${ex.orderBy}
     </select>
+
+    <select id="pgOrderList" resultType="com.gree.mall.manager.bean.worker.SettlementPgOrderVO">
+
+    </select>
 </mapper>