Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeTempServiceImpl.java

@@ -53,7 +53,7 @@ public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
     public void deleteForTimer() {
         log.info("删除临时活码定时开始");
         List<TabHmQrcodeTemp> list = this.hmQrcodeTempMapper.listAll();
-        if (CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             for (TabHmQrcodeTemp item : list) {
                 this.del(item);
             }
@@ -67,7 +67,9 @@ public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
             String configId = item.getWxConfigId();
             QywxResponseDTO resp = this.qywxUserApiService.delContactWay(corpid, suiteId, configId);
             log.info("删除临时活码={}{},返回={}", configId, corpid, JSON.toJSONString(resp));
-            this.hmQrcodeTempMapper.deleteByPrimaryKey(item.getId());
+            if(resp.getErrcode()==0) {
+                this.hmQrcodeTempMapper.deleteByPrimaryKey(item.getId());
+            }
         } catch (Exception e) {
             log.info("删除临时活码异常={}", e);
         }

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

@@ -347,9 +347,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
                     if (!addResp.isSuccess()) {
                         retDTO.setSm("创建动态活码失败,取单人活码");
+                        if(StringUtils.isBlank(hm.getWxQrcode())) {
+                            return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "导购活码不存在"); 
+                        }
                         retDTO.setHmQrcode(hm.getWxQrcode());
                     } else {
-                        // retDTO.setSm("动态活码");
                         retDTO.setHmQrcode(addResp.getResult());
                     }
                 }

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -315,7 +315,7 @@
         select store_id storeId,
                MIN(over_flag) overFlag
         from tab_haoban_hm_qrcode
-        where enterprise_id = #{enterpriseId}  and status_flag in = 1
+        where enterprise_id = #{enterpriseId}  and status_flag = 1
           and store_id is not null
           GROUP BY store_id
     </select>