Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/impl/StoreBusinessTimeServiceImpl.java

@@ -65,19 +65,21 @@ public class StoreBusinessTimeServiceImpl implements StoreBusinessTimeService {
     public void convertBusinessTime(List<StoreBusinessTimeDTO> businessTimeDTOList) {
         for (StoreBusinessTimeDTO storeBusinessTimeDTO : businessTimeDTOList) {
             String weekday = storeBusinessTimeDTO.getWeekday();
-            List<Integer> list = Stream.of(weekday.split(GlobalInfo.FLAG_COMMA)).filter(e -> StringUtils.isNotBlank(e)).map(Integer::parseInt).collect(Collectors.toList());
-            if (list.size() >= 3 && list.get(list.size() - 1) - list.get(0) == list.size() - 1) {
-                // 超过三条的需要判断
-                // 都是连续的
-                storeBusinessTimeDTO.setWeekdayShow(WeekdayEnum.parse(list.get(0)) + "至" + WeekdayEnum.parse(list.get(list.size() - 1)));
-            } else {
-                // 直接解析返回
-                StringBuilder sb = new StringBuilder();
-                for (Integer code : list) {
-                    sb.append(WeekdayEnum.parse(code)).append("、");
+            if (StringUtils.isNotBlank(weekday)) {
+                List<Integer> list = Stream.of(weekday.split(GlobalInfo.FLAG_COMMA)).filter(e -> StringUtils.isNotBlank(e)).map(Integer::parseInt).collect(Collectors.toList());
+                if (list.size() >= 3 && list.get(list.size() - 1) - list.get(0) == list.size() - 1) {
+                    // 超过三条的需要判断
+                    // 都是连续的
+                    storeBusinessTimeDTO.setWeekdayShow(WeekdayEnum.parse(list.get(0)) + "至" + WeekdayEnum.parse(list.get(list.size() - 1)));
+                } else {
+                    // 直接解析返回
+                    StringBuilder sb = new StringBuilder();
+                    for (Integer code : list) {
+                        sb.append(WeekdayEnum.parse(code)).append("、");
+                    }
+                    sb.deleteCharAt(sb.length() - 1);
+                    storeBusinessTimeDTO.setWeekdayShow(sb.toString());
                 }
-                sb.deleteCharAt(sb.length() - 1);
-                storeBusinessTimeDTO.setWeekdayShow(sb.toString());
             }
         }
     }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -207,18 +207,16 @@ public class StoreApiServiceImpl implements StoreApiService {
             sb.append("门店电话").append("【").append(oldStore.getConactsPhone()).append("】")
                     .append("变更为【").append(newStore.getConactsPhone()).append("】");
         }
-        if (CollectionUtils.isNotEmpty(oldStore.getBusinessTimeList())) {
-            if (!CollectionUtils.isEqualCollection(oldStore.getBusinessTimeList(), newStore.getBusinessTimeList())) {
-                this.storeBusinessTimeService.convertBusinessTime(newStore.getBusinessTimeList());
-                String oldBusinessTimeShow = oldStore.getBusinessTimeList().stream()
-                        .map(e -> e.getWeekdayShow() + ":" + DateUtil.dateToStr(e.getOpenTime(), DateUtil.FORMAT_MINUTE_TIME) + "~" + DateUtil.dateToStr(e.getCloseTime(), DateUtil.FORMAT_MINUTE_TIME))
-                        .reduce((x, y) -> x + "" + y).orElse("");
-                String newBusinessTimeShow = newStore.getBusinessTimeList().stream()
-                        .map(e -> e.getWeekdayShow() + ":" + DateUtil.dateToStr(e.getOpenTime(), DateUtil.FORMAT_MINUTE_TIME) + "~" + DateUtil.dateToStr(e.getCloseTime(), DateUtil.FORMAT_MINUTE_TIME))
-                        .reduce((x, y) -> x + "," + y)
-                        .orElse("");
-                sb.append("营业时间").append("【").append(oldBusinessTimeShow).append("】")
-                        .append("变更为【").append(newBusinessTimeShow).append("】");
+        if (CollectionUtils.isNotEmpty(newStore.getBusinessTimeList())) {
+            if (CollectionUtils.isEmpty(oldStore.getBusinessTimeList()) || !CollectionUtils.isEqualCollection(oldStore.getBusinessTimeList(), newStore.getBusinessTimeList())) {
+                if (StringUtils.isNotBlank(newStore.getBusinessTimeList().get(0).getWeekday())) {
+                    this.storeBusinessTimeService.convertBusinessTime(newStore.getBusinessTimeList());
+                    String newBusinessTimeShow = newStore.getBusinessTimeList().stream()
+                            .map(e -> e.getWeekdayShow() + ":" + DateUtil.dateToStr(e.getOpenTime(), DateUtil.FORMAT_MINUTE_TIME) + "~" + DateUtil.dateToStr(e.getCloseTime(), DateUtil.FORMAT_MINUTE_TIME))
+                            .reduce((x, y) -> x + "," + y)
+                            .orElse("");
+                    sb.append("营业时间").append("变更为【").append(newBusinessTimeShow).append("】");
+                }
             }
         }
         if (StringUtils.isNotBlank(newStore.getBrandIds()) && !StringUtils.equals(newStore.getBrandIds(), oldStore.getBrandIds())) {
@@ -240,7 +238,15 @@ public class StoreApiServiceImpl implements StoreApiService {
             for (int i = 0; i < newStore.getStoreExtendList().size(); i++) {
                 StoreExtendDTO newStoreExtend = newStore.getStoreExtendList().get(i);
                 if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
-                    sb.append("变更为【").append(newStoreExtend.getValue()).append("】");
+                    Integer fieldType = newStoreExtend.getStoreFieldType();
+                    if (StoreFieldTypeEnum.RADIO.getCode() == fieldType || StoreFieldTypeEnum.CHECK.getCode() == fieldType) {
+                        if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
+                            TabStoreFieldSelect select = storeFieldSelectService.getStoreFieldSelectById(Integer.parseInt(newStoreExtend.getValue()));
+                            sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(select.getStoreFieldSelectName()).append("】");
+                        }
+                    } else {
+                        sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(newStoreExtend.getValue()).append("】");
+                    }
                 }
             }
         }
@@ -551,7 +557,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         }
 
         // 自定义属性
-        List<TabStoreExtend> extendList = storeExtendService.listByStoreInfoId(enterpriseId, storeId);
+        List<TabStoreExtend> extendList = storeExtendService.listByStoreInfoId(enterpriseId, storeDTO.getStoreInfoId());
         List<StoreExtendDTO> extendDTOList = storeExtendService.convertStoreExtendToDTO(extendList);
         storeDTO.setStoreExtendList(extendDTOList);
         Integer fromEnterpriseId = storeDTO.getFromEnterpriseId();

gic-store-service/src/main/resources/mapper/TabClerkLogMapper.xml

@@ -191,5 +191,6 @@
     <if test="content != null and content != '' ">
         and content like concat('%', #{content}, '%')
     </if>
+    order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreLogMapper.xml

@@ -191,5 +191,6 @@
     <if test="content != null and content != '' ">
       and content like concat('%', #{content}, '%')
     </if>
+    order by create_time desc
   </select>
 </mapper>
\ No newline at end of file