Merge remote-tracking branch 'origin/feature/asyncOrder' into feature/asyncOrder

# Conflicts:
#	sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.xml

@@ -103,6 +103,7 @@
         where order_count = on_sale_count
         and be_order_count=0  and i_e_flag='I' and check_pass_status=1
         <if test=' this.has("veNo") '>and ve_no like concat('%',#{veNo},'%')</if>
+		<if test=' this.has("shopName") '>and shop_name like concat('%',#{shopName},'%')</if>
         <if test=' this.has("productName") '>and goods_names like concat('%',#{productName},'%')</if>
         <if test=' this.has("dateBegin") '>and date_format(create_time,'%Y-%m-%d') &gt;=#{dateBegin}</if>
         <if test=' this.has("dateEnd") '>and date_format(create_time,'%Y-%m-%d') &lt;=#{dateEnd}</if>

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -1,17 +1,14 @@
 package com.pj.project.app_user;
 
-
 import com.pj.api.consts.FeignFactory;
-import com.pj.api.dto.AppUserCreateDTO;
 import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.PeopleDto;
 import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.enummj.DeleteStatus;
 import com.pj.project.app_user.dto.ForgetPasswordDto;
 import com.pj.project.app_user.dto.LoginDto;
 import com.pj.project.app_user.dto.RegisterDto;
 import com.pj.project.app_user.vo.AppUserVo;
-import com.pj.project4sp.face.factory.FaceFactory;
-import com.pj.project4sp.utils.ImageUtils;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 
@@ -22,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -203,8 +201,13 @@ public class AppUserApiController {
      * 注销账户
      */
     @RequestMapping("delete")
-    public AjaxJson delete(Long id) {
-        appUserService.delete(id);
+    public AjaxJson delete(Long id){
+        AppUser appUser = new AppUser();
+        appUser.setId(id);
+        appUser.setDeleteStatus(DeleteStatus.DELETE_STATUS_OFF.getCode()); //被逻辑删除
+        appUser.setUpdateTime(new Date());
+        appUserService.update(appUser);
+
         return AjaxJson.getSuccess();
     }