Merge branch 'feature/xgh/202503' into 'master'

替换删除导购接口

See merge request !2845

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -472,6 +472,10 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
     @Override
     public void getMomentId(Long planId) {
         TabQwMomentPlan plan =  this.qwMomentPlanMapper.getById(planId) ;
+        if(null == plan) {
+            logger.info("计划已删除");
+            return;
+        }
         String wxEnterpriseId =plan.getWxEnterpriseId() ;
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         ServiceResponse<Object> resp2 = this.qywxExternalUserService.getMomentTaskResult(qwDTO.getThirdCorpid(),

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java

@@ -29,7 +29,8 @@ public class SyncHaobanToGicApiServiceImpl implements SyncHaobanToGicApiService
 	@Override
 	public void delGicClerk(String gicClerkId) {
 		logger.info("【删除gicClerk】clerkID={}",gicClerkId);
-		clerkService.delClerk(gicClerkId);
+		//clerkService.delClerk(gicClerkId);
+		this.clerkService.delClerkByHaoBan(gicClerkId) ;
 	}
 
 //	@Override

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/offline/OfflinePreController.java

@@ -139,6 +139,9 @@ public class OfflinePreController {
         if(StringUtils.isBlank(offlinePreId) || !offlinePreId.trim().chars().allMatch(Character::isDigit)) {
             return RestResponse.failure("9999","参数错误") ;
         }
+        if(offlinePreId.length()>18) {
+            return RestResponse.failure("9999","参数错误") ;
+        }
         ServiceResponse<Void> countOfflinePre = offlinePreApiService.checkOfflinePreWriteOff(Long.valueOf(offlinePreId.trim()), storeId);
         return JSONObject.parseObject(JSONObject.toJSONString(countOfflinePre, SerializerFeature.WriteMapNullValue), RestResponse.class);
     }