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

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

@@ -225,14 +225,14 @@ public class PayOrderLogic {
 
             totalAmount = totalAmount.add(workerOrderBuy.getServicePrice());
 
-            BigDecimal workerServiceProceAmount = workerOrderBuy.getServicePrice().multiply(Convert.toBigDecimal("0.006"));
+            BigDecimal workerServiceProceAmount = workerOrderBuy.getServicePrice().multiply(Convert.toBigDecimal("0"));
 
 
             if (workerServiceProceAmount.doubleValue() > 0.01) {
                 workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
 
             }else {
-                workerProceAmount.add(Convert.toBigDecimal("0.01"));
+                workerProceAmount.add(Convert.toBigDecimal("0"));
             }
         }
 
@@ -240,14 +240,14 @@ public class PayOrderLogic {
         if (workerOrderBuy.getOtherPrice() != null && workerOrderBuy.getServicePrice().doubleValue() > 0){
 
             totalAmount = totalAmount.add(workerOrderBuy.getOtherPrice());
-            BigDecimal workerOtherProceAmount = workerOrderBuy.getOtherPrice().multiply(Convert.toBigDecimal("0.006"));
+            BigDecimal workerOtherProceAmount = workerOrderBuy.getOtherPrice().multiply(Convert.toBigDecimal("0"));
 
 
             if (workerOtherProceAmount.doubleValue() > 0.01) {
                 workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
 
             }else {
-                workerProceAmount.add(Convert.toBigDecimal("0.01"));
+                workerProceAmount.add(Convert.toBigDecimal("0"));
             }
 
         }

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

@@ -211,7 +211,8 @@ public interface CommonMapper {
      * @return
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType);
+    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType
+    ,@Param("companyWechatId") String companyWechatId);
 
     /**
      * 考核项目配件列表

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

@@ -112,7 +112,8 @@ public class OrderBaseLogic {
         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());
+        IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {

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

@@ -40,16 +40,6 @@ public class SettlementSchedule {
     @Autowired
     EsOrderInfoService esOrderInfoService;
 
-    /**到达提现时间变为可提现
-     *
-     */
-    @Scheduled(fixedDelay = 60 * 1000)
-    public void task() {
-        settlementOrderService.lambdaUpdate()
-                .lt(SettlementOrder::getChangeTime,new Date())
-                .eq(SettlementOrder::getStatus,SettlementStatusEnum.WAIT.getKey())
-                .set(SettlementOrder::getStatus, SettlementStatusEnum.WAIT_ING.getKey()).update();
-    }
 
 
     /**服务结束改为服务结束

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

@@ -354,6 +354,9 @@
                 <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