新增微信小程序用户信息采集进度查询和终止逻辑

fs-service/src/main/java/com/fs/his/param/FsStoreOrderParam.java

@@ -81,6 +81,10 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable {
     @Excel(name = "支付方式 1微信")
     private String payType;
 
+    /** 标签 */
+    @Excel(name = "标签")
+    private String tags;
+
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 1：待支付 2：待发货；3：待收货；4：待评价；5：已完成） 6(金牛代服待推送，请避开6)*/
     @Excel(name = "订单状态", readConverterExp = "-=1,:=,申=请退款,-=2,:=,退=货成功,1=：待支付,2=：待发货；3：待收货；4：待评价；5：已完成")
     private Integer status;

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderExcelVO.java

@@ -141,4 +141,7 @@ public class FsStoreOrderExcelVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "入账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date tuiMoneyTime;
+
+    @Excel(name = "标签")
+    private String tagNames;
 }

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderExportVO.java

@@ -228,4 +228,9 @@ public class FsStoreOrderExportVO implements Serializable
 
     @Excel(name = "订单来源" , dictType = "sys_order_source")
     private Integer source;
+
+    /** 标签 */
+    @Excel(name = "标签")
+    private String tagNames;
+
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderParam.java

@@ -89,4 +89,9 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
 
     private Long storeId;
 
+    /**
+     * 标签名称
+     */
+    private String tagNames;
+
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -171,6 +171,10 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "快递公司")
     private String deliveryName;
 
+    /** 快递名称/送货人姓名 */
+    @Excel(name = "标签")
+    private String tagNames;
+
     /** 快递单号/手机号 */
     @Excel(name = "快递单号")
     private String deliveryId;

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderVO.java

@@ -233,6 +233,9 @@ public class FsStoreOrderVO implements Serializable
     @Excel(name = "快递帐单日期")
     private String deliveryTime;
 
+    @Excel(name = "标签")
+    private String tagNames;
+
     @Excel(name = "快递结算日期")
     private String deliveryPayTime;
     @Excel(name = "物流代收金额")

fs-user-app/src/main/java/com/fs/app/controller/UserInfoCollectionController.java

@@ -10,6 +10,7 @@ import com.fs.course.vo.FsUserInfoCollectionUVO;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsUser;
 import com.fs.his.domain.FsUserInformationCollectionSchedule;
+import com.fs.his.enums.PrescriptionTaskStepEnum;
 import com.fs.his.service.IFsUserService;
 import com.fs.hisStore.domain.FsUserInformationCollection;
 import com.fs.hisStore.param.FsUserInformationCollectionParam;
@@ -18,10 +19,13 @@ import com.fs.qw.service.IFsUserInformationCollectionScheduleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Api("用户信息采集接口")
 @RestController
@@ -124,4 +128,19 @@ public class UserInfoCollectionController extends AppBaseController {
         FsUser user=userService.selectFsUserByUserId(Long.parseLong(getUserId()));
         return userInformationCollectionService.stopCollection(param,user.getUserId());
     }
+    /**
+     * 微信小程序获取用户信息采集任务流程步骤枚举列表
+     */
+    @GetMapping("/schedule/steps")
+    public AjaxResult getTaskSteps() {
+        List<Map<String, Object>> steps = Arrays.stream(PrescriptionTaskStepEnum.values())
+                .map(enumItem -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("dictValue", enumItem.getCode());
+                    map.put("dictLabel", enumItem.getDesc());
+                    return map;
+                })
+                .collect(Collectors.toList());
+        return AjaxResult.success(steps);
+    }
 }