Merge branch 'feature/获取用户敏感信息' into 'developer'

非空判断

See merge request !886

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

@@ -258,11 +258,13 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             if (activeDetail.getErrcode() == 0) {
                 String userid = activeDetail.getUserid();
                 activeAccount.setWxUserId(userid);
-                activeAccount.setAccountType(activeDetail.getType());
                 activeAccount.setStatus(activeDetail.getStatus());
-                activeAccount.setExpireTime(DateUtil.date(activeDetail.getExpireTime() * 1000));
-                activeAccount.setActiveTime(DateUtil.date(activeDetail.getActiveTime() * 1000));
+                if(null != activeDetail.getExpireTime()) {
+                    activeAccount.setExpireTime(DateUtil.date(activeDetail.getExpireTime() * 1000));
+                    activeAccount.setActiveTime(DateUtil.date(activeDetail.getActiveTime() * 1000));
+                }
             }
+            activeAccount.setAccountType(2);
             activeAccount.setOrderId(orderId);
             activeAccount.setActiveCode(activeCode);
             activeAccount.setCorpId(corpid);