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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -489,8 +489,7 @@ public class PayOrderLogic {
 
         List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
 
-
-        workerOrder.setSource(commonLogic.getSource().equals(OrderInfoSourceEnum.A)?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
+        workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/ESOrderBaseController.java

@@ -81,7 +81,7 @@ public class ESOrderBaseController {
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
         //2.查询要导出的内容
         zfireParamBean.setPageNum(1);
-        zfireParamBean.setPageSize(10000);
+        zfireParamBean.setPageSize(30000);
         IPage<OrderBaseVO> orderBaseVOIPage = orderBaseEsLogic.orderBaseEsList(zfireParamBean);
         //3.导出
         FieldUtils.exportData(orderBaseVOIPage.getRecords(), zfireParam.getExportFields(), request, response);

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

@@ -258,7 +258,7 @@ public class PolicyOrderLogic {
                 policyOrderup.setId(IdWorker.getIdStr());
                 policyOrderup.setPolicyId(policyOrderup.getId());
                 policyOrderup.setPolicyNumber(policyOrderup.getId());
-                policyOrderup.setPolicyName("意外险");
+                policyOrderup.setPolicyName("工伤险");
 
                 policyOrderup.setType("IN");
 
@@ -267,8 +267,8 @@ public class PolicyOrderLogic {
                 policyOrderup.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
                 policyOrderup.setEndTime(this.getEndOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
 
-                policyOrderup.setIsSend(IsYesNoEnum.NO.getKey());
-                policyOrderup.setIsReceipt(IsYesNoEnum.NO.getKey());
+                policyOrderup.setIsSend(IsYesNoEnum.YES.getKey());
+                policyOrderup.setIsReceipt(IsYesNoEnum.YES.getKey());
 
 
                 policyOrderup.setBelongCompany(adminWebsit.getBelongCompany());
@@ -302,6 +302,14 @@ public class PolicyOrderLogic {
                     policyOrderup.setPolicyOrderStatus("DSX");
                 }
 
+                if (policyOrderService.lambdaQuery().lt(PolicyOrder::getStartTime,policyOrderup.getEndTime())
+                .gt(PolicyOrder::getEndTime,policyOrderup.getStartTime())
+                        .eq(PolicyOrder::getType,"IN")
+                        .ne(PolicyOrder::getPolicyOrderStatus,"YSX")
+                        .eq(PolicyOrder::getWebsitUserId,policyOrderup.getWebsitUserId()).count() > 0){
+                    throw new RemoteServiceException(errPrefix + "师傅已导入该时间段得保险");
+                }
+
                 policyOrderup.insert();
 
 
@@ -309,7 +317,7 @@ public class PolicyOrderLogic {
                 WorkerPolicy workerPolicy = new WorkerPolicy();
                 workerPolicy.setWorkerId(websitUser.getWorkerNumber());
                 workerPolicy.setType("IN");
-
+                workerPolicy.setOrderId(policyOrderup.getId());
                 workerPolicy.setPolicyName(policyOrderup.getPolicyName());
                 workerPolicy.setCompany(policyOrderup.getCompany());
 
@@ -329,6 +337,15 @@ public class PolicyOrderLogic {
                     workerPolicy.setStatus("DSX");
                 }
                 workerPolicy.insert();
+
+                if (workerPolicyService.lambdaQuery().lt(WorkerPolicy::getStartTime,policyOrderup.getEndTime())
+                        .gt(WorkerPolicy::getEndTime,policyOrderup.getStartTime())
+                        .eq(WorkerPolicy::getPolicyType,"IN")
+                        .ne(WorkerPolicy::getStatus,"YSX")
+                        .eq(WorkerPolicy::getWebsitUserId,policyOrderup.getWebsitUserId()).count() > 0){
+                    throw new RemoteServiceException(errPrefix + "师傅已导入该时间段得保险");
+                }
+
             }
 
 

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

@@ -828,7 +828,8 @@ public class SettlementOrderLogic {
 
             List<PgOrderBase> pgOrderBaseList = pgOrderBases.stream().filter(item ->
                     item.getOrderSmallTypeText().equals(record.getOrderSmallTypeText())
-                    && item.getWorkerName().equals(record.getWorkerNumber())
+                            && !StringUtil.isEmpty(item.getWorkerNumber())
+                    && item.getWorkerNumber().equals(record.getWorkerNumber())
                     && item.getWebsitId().equals(record.getWebsitId())
             ).collect(Collectors.toList());
 

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

@@ -74,20 +74,16 @@ public class OrderBaseEsLogic {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
-        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
-
+        BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
+        this.montage(queryBuilder1,zfireParamBean);
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-            List<QueryBuilder> should = queryBuilder.should();
-            if (adminUser.getType().equals(1)) {
-                should.add(QueryBuilders.termsQuery("company_wechat_id", adminUser.getCompanyWechatId()));
-            }
-            should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-            should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
-        }
+            queryBuilder1.must(
+                    QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                    .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                    );
 
-        BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
-        this.montage(queryBuilder1,zfireParamBean);
+        }
 
         List<String> orderBaseId = new ArrayList<>();
 
@@ -112,12 +108,13 @@ public class OrderBaseEsLogic {
 
 
         NativeSearchQuery build = new NativeSearchQueryBuilder()
-                .withQuery(queryBuilder)
                 .withQuery(queryBuilder1)
                 .withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
                 .withPageable(PageRequest.of(zfireParamBean.getPageNum() -1, zfireParamBean.getPageSize()))
                 .build();
 
+        build.setTrackTotalHits(true);
+
 
         SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
         SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());

mall-server-api/src/main/java/com/gree/mall/manager/schedule/OrderBaseSchedule.java

@@ -81,7 +81,7 @@ public class OrderBaseSchedule {
     @Scheduled(cron = "0 0 17 * * ?")
   //  @Scheduled(fixedDelay = 60  * 1000)
     public void fenzhang() throws WxPayException {
-        List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().eq(SettlementOrder::getStatus, "WAIT").list();
+        List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().in(SettlementOrder::getStatus, "WAIT","YC").list();
 
         for (SettlementOrder settlementOrder : settlementOrders) {
             wechatLogic.shareSettlementAmountCorn(settlementOrder);

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

@@ -359,7 +359,7 @@
             #{item}
         </foreach>
         </if>
-        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0 and adminUserType != null and adminUserType == 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0 ">
             AND (
                 a.websit_id IN
                 <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
@@ -370,9 +370,7 @@
                 <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-            <if test="companyWechatId != null and companyWechatId != ''">
-                or a.company_wechat_id  =  #{companyWechatId}
-            </if>
+
             )
         </if>
         order by a.create_time desc,id desc

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

@@ -177,7 +177,7 @@
         	d.belong_company,
         	d.belong_company_code,
         	d.websit_id,
-        	d.`name`,
+        	d.`name` as websit_name,
         	d.link_name,
         	d.link_mobile,
         	a.worker_name,