查看数据功能

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseStudyMapper.java

@@ -74,7 +74,7 @@ public interface FsUserCourseStudyMapper
             "<if test = ' maps.courseType != null and maps.courseType == 1 '> " +
             "and c.cate_id = (select cate_id from fs_user_course_category WHERE cate_name like '%央广原乡行%' AND cate_type = 1 limit 1) " +
             "</if>" +
-            "<if test = ' maps.courseType == null  '> " +
+            "<if test = ' maps.courseType == null  or maps.courseType == 0'> " +
             "and c.cate_id != (select cate_id from fs_user_course_category WHERE cate_name like '%央广原乡行%' AND cate_type = 1 limit 1) " +
             "</if>" +
             " order by s.study_id  "+

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2291,18 +2291,20 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if (express == null) {
                 express = selectExpressByOmsDeliverCode(deliverCode);
             }
+
+            if (kdnDeliverName.length() > 0) {
+                deliverName = kdnDeliverName.toString();
+            }
+            // 卓美需求，查询失败，也要修改订单号码
+            order.setDeliveryName(deliverName);
+            order.setDeliverySn(express == null ? "" :  express.getCode());
+            order.setDeliveryId(deliveryId);
+            order.setDeliverySendTime(new Date());
+            fsStoreOrderMapper.updateFsStoreOrder(order);
+            orderStatusService.create(order.getId(), OrderLogEnum.DELIVERY_GOODS.getValue(),
+                    OrderLogEnum.DELIVERY_GOODS.getDesc());
+            //订阅物流回调
             if (express != null) {
-                if (kdnDeliverName.length() > 0) {
-                    deliverName = kdnDeliverName.toString();
-                }
-                order.setDeliveryName(deliverName);
-                order.setDeliverySn(express.getCode());
-                order.setDeliveryId(deliveryId);
-                order.setDeliverySendTime(new Date());
-                fsStoreOrderMapper.updateFsStoreOrder(order);
-                orderStatusService.create(order.getId(), OrderLogEnum.DELIVERY_GOODS.getValue(),
-                        OrderLogEnum.DELIVERY_GOODS.getDesc());
-                //订阅物流回调
                 String lastFourNumber = "";
                 if (express.getCode().equals(ShipperCodeEnum.SF.getValue())  || express.getCode().equals(ShipperCodeEnum.ZTO.getValue())) {
                     lastFourNumber = order.getUserPhone();