Merge branch 'store-class-features' into 4.2

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -1161,9 +1161,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>()
                 .eq(OrderServe::getOrderId, orderId));
 
-        List<OrderRecord> orderRecordList = orderRecordMapper.selectList(new LambdaQueryWrapper<OrderRecord>()
-                .eq(OrderRecord::getOrderId, orderId));
-
         CustomerDetail customerDetail = customerDetailMapper.selectOne(new LambdaQueryWrapper<CustomerDetail>().eq(CustomerDetail::getCustomerId, orderManage.getOrderUser()));
 
         Customer customer = customerMapper.selectById(orderManage.getOrderUser());
@@ -1172,15 +1169,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         for (OrderServe orderServe : orderServeList) {
             OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>()
-                    .eq(OrderRecord::getOrderId, orderId)
                     .eq(OrderRecord::getOrderServeId, orderServe.getId()));
 
             if (orderServe.getOrderRecordCondition() != null
                     && (orderServe.getOrderRecordCondition() == 1 || orderServe.getOrderRecordCondition() == 2)
                     && (orderServe.getServeTypeId() == 9 || orderServe.getServeTypeId() == 12)) {
 
-                List<OrderServeDescribeRelevance> orderServeDescribeRelevanceList = orderServeDescribeRelevanceMapper.selectList(new LambdaQueryWrapper<OrderServeDescribeRelevance>()
-                        .eq(OrderServeDescribeRelevance::getOrderServeId, orderServe.getId()));
+                List<OrderServeDescribeRelevance> orderServeDescribeRelevanceList = orderServeDescribeRelevanceMapper
+                        .selectList(new LambdaQueryWrapper<OrderServeDescribeRelevance>()
+                                .eq(OrderServeDescribeRelevance::getOrderServeId, orderServe.getId()));
                 if (ListUtil.isEmpty(orderServeDescribeRelevanceList)) {
                     dataRate = dataRate - dataRateMap.get(1);
                     break;
@@ -1195,10 +1192,11 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         for (OrderServe orderServe : orderServeList) {
             OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>()
-                    .eq(OrderRecord::getOrderId, orderId)
                     .eq(OrderRecord::getOrderServeId, orderServe.getId()));
+
             if (orderServe.getOrderRecordCondition() != null
-                    && (orderServe.getOrderRecordCondition() == 1 || orderServe.getOrderRecordCondition() == 2)) {
+                    && (orderServe.getOrderRecordCondition() == 1 || orderServe.getOrderRecordCondition() == 2)
+                    && (orderServe.getServeTypeId() == 9 || orderServe.getServeTypeId() == 12)) {
                 if (orderRecord == null || StringUtils.isEmpty(orderRecord.getPicturePath())) {
                     dataRate = dataRate - dataRateMap.get(2);
                     break;
@@ -1214,7 +1212,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             dataRate = dataRate + dataRateMap.get(4);
         }
 
-        if (StringUtils.isNotEmpty(customerDetail.getPreference())) {
+        if (customerDetail != null && StringUtils.isNotEmpty(customerDetail.getPreference())) {
             dataRate = dataRate + dataRateMap.get(5);
         }
 

src/main/java/com/gogirl/application/store/store/impl/StoreClassesServiceImpl.java

@@ -11,9 +11,9 @@ import com.gogirl.infrastructure.mapper.store.store.StoreClassesMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
@@ -26,23 +26,10 @@ public class StoreClassesServiceImpl extends ServiceImpl<StoreClassesMapper, Sto
         List<StoreClasses> classList = this.list(new LambdaQueryWrapper<StoreClasses>()
                 .eq(StoreClasses::getDepartmentId, departmentId));
 
-        //处理一个对应关系只返回012
-        Map<Integer, Integer> map = new HashMap<>();
-        map.put(0, 0);
-        for (int i = 0; i < classList.size(); i++) {
-            StoreClasses item = classList.get(i);
-            if (item.getName().equals("早班")) {
-                map.put(item.getId(), 1);
-            } else if (item.getName().equals("晚班")) {
-                map.put(item.getId(), 2);
-            }
-        }
+        Map<Integer, StoreClasses> classesMap = classList.stream().collect(Collectors.toMap(StoreClasses::getId, storeClasses -> storeClasses));
 
         List<StoreClassesTechnician> lists = storeClassesTechnicianService.listClassesTechnicianDetail(technicianId, month);
-        //替换排班的class
-        for (StoreClassesTechnician item : lists) {
-            item.setClasses(map.get(item.getClasses()));
-        }
+        lists.forEach(item -> item.setClassesManage(classesMap.get(item.getClasses())));
         return lists;
     }
 }

src/main/java/com/gogirl/domain/store/store/StoreClassesTechnician.java

@@ -39,8 +39,6 @@ public class StoreClassesTechnician implements Serializable {
     /**
      * 非数据库字段
      */
-
-
     @ApiModelProperty("班次")
     @TableField(exist = false)
     private StoreClasses classesManage;

src/test/java/com/gogirl/Test.java

@@ -667,7 +667,7 @@ public class Test {
 
 
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
-                .gt(OrderManage::getCreateTime, "2020-09-07"));
+                .gt(OrderManage::getCreateTime, "2020-09-01"));
 
         orderManageList.forEach(orderManage -> {
             try {
@@ -675,7 +675,7 @@ public class Test {
                 orderManage.setDataIntegrity(dataIntegrity);
                 orderManageMapper.updateById(orderManage);
             } catch (Exception e) {
-
+                log.error(e.getMessage(), e);
             }
         });
     }

src/test/java/com/gogirl/application/order/sys/IWxOrderFlowServiceTest.java

+package com.gogirl.application.order.sys;
+
+import org.junit.Test;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/24 10:02 上午
+ */
+public class IWxOrderFlowServiceTest {
+
+    @Test
+    public void log() {
+
+//        WxOrderFlow wxOrderFlow = WxOrderFlow.getInstance(result);
+//        wxOrderFlow.setSourceFrom(WxOrderFlow.CUSTOMER);
+//        wxOrderFlow.setOutTradeNo(result.getOutTradeNo());
+//        wxOrderFlow.setOrderType(WxOrderFlow.CHARGE_ORDER);
+    }
+}