no message

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

@@ -1451,7 +1451,7 @@ public class OrderLogic {
 
         OrderAckBean orderAckBean = new OrderAckBean();
         orderAckBean.setDiscountAmount(BigDecimal.valueOf(0));
-//        orderAckBean.setOpenId(user.getOpenId());
+        orderAckBean.setOpenId(user.getOpenId());
         List<AckGoodsBean> list = new ArrayList<>();
         //业务员
         User service = user.getType().equals(UserTypeEnum.SERVICE.toString()) ? user : null;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -14,8 +14,8 @@ import java.util.Date;
 @Data
 public class UserVO {
 
-    @ZfireField(hide = true, tbName = "b")
-    private String id;
+//    @ZfireField(hide = true, tbName = "b")
+//    private String id;
 
     @ZfireField(hide = true)
     private String userId;
@@ -26,15 +26,15 @@ public class UserVO {
 //    @ApiModelProperty("商户名称")
 //    private String companyName;
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("网点编号")
-    private String websitId;
-
-    @ZfireField(tbName = "c", colName = "name", ignoreSelect = true)
-    @ApiModelProperty("网点名称")
-    private String websitName;
+//    @ZfireField(tbName = "b")
+//    @ApiModelProperty("网点编号")
+//    private String websitId;
+//
+//    @ZfireField(tbName = "c", colName = "name", ignoreSelect = true)
+//    @ApiModelProperty("网点名称")
+//    private String websitName;
 
-    @ZfireField(tbName = "b")
+//    @ZfireField(tbName = "b")
     @ApiModelProperty("师傅编号")
     private String workerNumber;
 
@@ -53,28 +53,28 @@ public class UserVO {
     @ZfireField(hide = true, tbName = "b")
     private String slaveWorkerId;
 
-    @ZfireField(tbName = "d", colName = "nick_name", ignoreSelect = true)
-    @ApiModelProperty("辅助师傅")
-    private String slaveWorkerName;
+//    @ZfireField(tbName = "d", colName = "nick_name", ignoreSelect = true)
+//    @ApiModelProperty("辅助师傅")
+//    private String slaveWorkerName;
 
     @ApiModelProperty("用户类型")
     private UserTypeEnum type;
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("审核状态")
-    private ExamineStatusEnum examineStatus;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("审批人")
-    private String examineBy;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("审批时间")
-    private Date examineTime;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("银行卡")
-    private String bankAccount;
+//    @ZfireField(tbName = "b")
+//    @ApiModelProperty("审核状态")
+//    private ExamineStatusEnum examineStatus;
+//
+//    @ZfireField(tbName = "b")
+//    @ApiModelProperty("审批人")
+//    private String examineBy;
+//
+//    @ZfireField(tbName = "b")
+//    @ApiModelProperty("审批时间")
+//    private Date examineTime;
+//
+//    @ZfireField(tbName = "b")
+//    @ApiModelProperty("银行卡")
+//    private String bankAccount;
 
 //    @ApiModelProperty("是否允许二手商城发布")
 //    private IsEnum isEs;

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -116,12 +116,12 @@ public class UserLogic {
     public IPage<UserVO> page2(WorkerParamBean userZfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         boolean isOK = false;
-        if (CollectionUtils.isNotEmpty(userZfireParamBean.getParams())) {
-            final long count = userZfireParamBean.getParams().stream()
-                    .filter(v -> v.getParam().equals("b.examine_status") && v.getValue().equals(ExamineStatusEnum.OK.getKey()))
-                    .count();
-            isOK = count > 0;
-        }
+//        if (CollectionUtils.isNotEmpty(userZfireParamBean.getParams())) {
+//            final long count = userZfireParamBean.getParams().stream()
+//                    .filter(v -> v.getParam().equals("b.examine_status") && v.getValue().equals(ExamineStatusEnum.OK.getKey()))
+//                    .count();
+//            isOK = count > 0;
+//        }
 
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 

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

@@ -88,20 +88,26 @@
     <select id="userList" resultType="com.gree.mall.manager.bean.listvo.UserVO">
         select
         ${ex.selected},
+        <!--
         b.websit_id,
         c.name as 'websit_name',
         d.nick_name as 'slaveWorkerName'
+        -->
         from user a
-        join websit_user b on a.user_id = b.user_id
-        join admin_websit c on c.websit_id = b.websit_id
-        left join user d on b.slave_worker_id = d.user_id
+        <!--
+           join websit_user b on a.user_id = b.user_id
+           join admin_websit c on c.websit_id = b.websit_id
+           left join user d on b.slave_worker_id = d.user_id
+           -->
         ${ex.query}
-        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
-            AND c.websit_id IN
-            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+       <!--
+       <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+           AND c.websit_id IN
+           <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+               #{item}
+           </foreach>
+       </if>
+       -->
         and a.apply_type='WORKER'
         <if test="isOK != null and isOK == true">
             AND a.worker_number IS NOT NULL
@@ -109,7 +115,7 @@
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>
-        ORDER BY FIELD(b.examine_status,'WAIT','OK','FAIL'),a.create_time DESC
+        ORDER BY <!-- FIELD(b.examine_status,'WAIT','OK','FAIL'), --> a.create_time DESC
     </select>
 
     <select id="userServiceList" resultType="com.gree.mall.manager.bean.listvo.User2VO">