Merge remote-tracking branch 'origin/master' into bugfix_0511_memberId_auth

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/licence/TabHaobanLicenceOrderMapper.java

@@ -109,7 +109,7 @@ public interface TabHaobanLicenceOrderMapper {
      * @param qywxOrderId
      * @return
      */
-    Integer saveQywxOrderId(@Param("orderId") Long orderId, @Param("qywxOrderId") String qywxOrderId);
+    Integer saveQywxOrderId(@Param("orderId") Long orderId, @Param("qywxOrderId") String qywxOrderId,@Param("qywxExpireTime") Date qywxExpireTime);
 
     List<String> getTransactionIdList(@Param("orderNumber") String orderNumber, @Param("wxEnterpriseId") String wxEnterpriseId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -235,13 +236,18 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                         }
                         if (null != cid) {
                             logger.info("hm={},群={},要删={}", wxChatId, qwChatIdList, cid.getWxChatId());
-                            qwChatIdList.remove(cid.getWxChatIdDk());
+                            Iterator<String> it = qwChatIdList.iterator() ;
+                            while(it.hasNext()) {
+                                if(it.next().equals(cid.getWxChatIdDk())) {
+                                    it.remove(); 
+                                }
+                            }
                             // 保存活码
                             List<TabGroupChat> list = this.groupChatMapper.listByWxWxChatIdListDk(wxEnterpriseId,
                                     qwChatIdList);
-                            if (CollectionUtils.isEmpty(list)) {
+                            if (CollectionUtils.isEmpty(list) || list.size() != qwChatIdList.size()) {
                                 this.saveChatFullNotice(wxEnterpriseId, thisGroupChatId);
-                                logger.info("查询群列表空,dkList={}", qwChatIdList);
+                                logger.info("查询群列表空,或数量不一致,dkList={}", qwChatIdList);
                                 return;
                             }
                             List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId())

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/LicenceOrderService.java

@@ -112,7 +112,7 @@ public interface LicenceOrderService {
      * @param qywxOrderId
      * @return
      */
-    Integer saveQywxOrderId(Long orderId, String qywxOrderId);
+    Integer saveQywxOrderId(Long orderId, String qywxOrderId,Date qywxExpireTime);
 
     /**
      * 查询订单编号id

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java

@@ -247,8 +247,8 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
     }
 
     @Override
-    public Integer saveQywxOrderId(Long orderId, String qywxOrderId) {
-        return tabHaobanLicenceOrderMapper.saveQywxOrderId(orderId,qywxOrderId);
+    public Integer saveQywxOrderId(Long orderId, String qywxOrderId,Date qywxExpireTime) {
+        return tabHaobanLicenceOrderMapper.saveQywxOrderId(orderId,qywxOrderId,qywxExpireTime);
     }
 
     @Override

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

@@ -225,11 +225,11 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
                 //企业微信订单有效，无需重复创建
                 return ServiceResponse.success(order.getQywxOrderId());
             }
-            if (null != dto && null != dto.getOrder() && dto.getOrder().getOrderStatus() == 3){
+/*            if (null != dto && null != dto.getOrder() && dto.getOrder().getOrderStatus() == 3){
                 //订单失效，记录企业微信订单状态
                 licenceOrderService.updateLicenceOrderType(order.getOrderId(), 3, order.getEnterpriseId(),
                         order.getWxEnterpriseId(), "系统", 0);
-            }
+            }*/
         }
         //创建企业微信订单
         CreateOrderQDTO orderQDTO = new CreateOrderQDTO();
@@ -250,8 +250,9 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
             CreateOrderResponseDTO result = newOrder.getResult();
             licenceOrderService.updateLicenceOrderType(order.getOrderId(), 0, order.getEnterpriseId(),
                     order.getWxEnterpriseId(), "系统", 0);
-
-            licenceOrderService.saveQywxOrderId(order.getOrderId(), result.getOrderId());
+            //企业微信订单过期时间更新,默认10天有效
+            Date qywxExpireTime = DateUtil.addDay(new Date(), 10);
+            licenceOrderService.saveQywxOrderId(order.getOrderId(), result.getOrderId(),qywxExpireTime);
             return ServiceResponse.success(result.getOrderId());
         }
         return ServiceResponse.failure(newOrder.getCode(), newOrder.getMessage());

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml

@@ -290,7 +290,7 @@
 
     <update id="saveQywxOrderId">
         UPDATE tab_haoban_licence_order
-        SET qywx_order_id = #{qywxOrderId} ,update_time = now()
+        SET qywx_order_id = #{qywxOrderId} ,update_time = now() ,qywx_expire_time= #{qywxExpireTime}
         WHERE order_id = #{orderId}
           and delete_flag = 0
     </update>